diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 18:19:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 18:19:55 -0700 |
| commit | 28a78e46f04ac5c4952533f2938a18699f207004 (patch) | |
| tree | 2991c5cea8d7f912abbe59e315fd1ed03febe45c /drivers/w1/slaves/w1_ds2423.c | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | b0d1f807f340e91b27aa721f6474956af11571da (diff) | |
| download | linux-next-28a78e46f04ac5c4952533f2938a18699f207004.tar.gz | |
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/slaves/w1_ds2423.c')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2423.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_ds2423.c b/drivers/w1/slaves/w1_ds2423.c index 7a7dbe5026f1..40a10b5ed120 100644 --- a/drivers/w1/slaves/w1_ds2423.c +++ b/drivers/w1/slaves/w1_ds2423.c @@ -66,7 +66,7 @@ static ssize_t w1_counter_read(struct device *device, wrbuf[0] = 0xA5; wrbuf[1] = rom_addr & 0xFF; wrbuf[2] = rom_addr >> 8; - mutex_lock(&dev->mutex); + mutex_lock(&dev->bus_mutex); if (!w1_reset_select_slave(sl)) { w1_write_block(dev, wrbuf, 3); read_byte_count = 0; @@ -124,7 +124,7 @@ static ssize_t w1_counter_read(struct device *device, } else { c -= snprintf(out_buf + PAGE_SIZE - c, c, "Connection error"); } - mutex_unlock(&dev->mutex); + mutex_unlock(&dev->bus_mutex); return PAGE_SIZE - c; } |