diff options
Diffstat (limited to 'drivers/w1/slaves/w1_therm.c')
-rw-r--r-- | drivers/w1/slaves/w1_therm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index ff29ae747ee8..d90062b211f8 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c | |||
@@ -179,7 +179,7 @@ static ssize_t w1_therm_read(struct device *device, | |||
179 | int i, max_trying = 10; | 179 | int i, max_trying = 10; |
180 | ssize_t c = PAGE_SIZE; | 180 | ssize_t c = PAGE_SIZE; |
181 | 181 | ||
182 | i = mutex_lock_interruptible(&dev->mutex); | 182 | i = mutex_lock_interruptible(&dev->bus_mutex); |
183 | if (i != 0) | 183 | if (i != 0) |
184 | return i; | 184 | return i; |
185 | 185 | ||
@@ -207,19 +207,19 @@ static ssize_t w1_therm_read(struct device *device, | |||
207 | w1_write_8(dev, W1_CONVERT_TEMP); | 207 | w1_write_8(dev, W1_CONVERT_TEMP); |
208 | 208 | ||
209 | if (external_power) { | 209 | if (external_power) { |
210 | mutex_unlock(&dev->mutex); | 210 | mutex_unlock(&dev->bus_mutex); |
211 | 211 | ||
212 | sleep_rem = msleep_interruptible(tm); | 212 | sleep_rem = msleep_interruptible(tm); |
213 | if (sleep_rem != 0) | 213 | if (sleep_rem != 0) |
214 | return -EINTR; | 214 | return -EINTR; |
215 | 215 | ||
216 | i = mutex_lock_interruptible(&dev->mutex); | 216 | i = mutex_lock_interruptible(&dev->bus_mutex); |
217 | if (i != 0) | 217 | if (i != 0) |
218 | return i; | 218 | return i; |
219 | } else if (!w1_strong_pullup) { | 219 | } else if (!w1_strong_pullup) { |
220 | sleep_rem = msleep_interruptible(tm); | 220 | sleep_rem = msleep_interruptible(tm); |
221 | if (sleep_rem != 0) { | 221 | if (sleep_rem != 0) { |
222 | mutex_unlock(&dev->mutex); | 222 | mutex_unlock(&dev->bus_mutex); |
223 | return -EINTR; | 223 | return -EINTR; |
224 | } | 224 | } |
225 | } | 225 | } |
@@ -258,7 +258,7 @@ static ssize_t w1_therm_read(struct device *device, | |||
258 | 258 | ||
259 | c -= snprintf(buf + PAGE_SIZE - c, c, "t=%d\n", | 259 | c -= snprintf(buf + PAGE_SIZE - c, c, "t=%d\n", |
260 | w1_convert_temp(rom, sl->family->fid)); | 260 | w1_convert_temp(rom, sl->family->fid)); |
261 | mutex_unlock(&dev->mutex); | 261 | mutex_unlock(&dev->bus_mutex); |
262 | 262 | ||
263 | return PAGE_SIZE - c; | 263 | return PAGE_SIZE - c; |
264 | } | 264 | } |