summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Fries <david@fries.net>2008-10-15 22:04:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 11:21:50 -0700
commite0d29c7699de723432da268748aefe9624fc8529 (patch)
treeb33860ee0924c1a61436d7ac8a917de316648d33
parentfe3cb82364332b9db3b574e9e41de9c27eff470a (diff)
downloadop-kernel-dev-e0d29c7699de723432da268748aefe9624fc8529.zip
op-kernel-dev-e0d29c7699de723432da268748aefe9624fc8529.tar.gz
W1: w1_therm consistent mutex access code cleanup
sl->master->mutex and dev->mutex refer to the same mutex variable, but be consistent and use the same set of pointers for the lock and unlock calls. It is less confusing (and one less pointer dereference this way). Signed-off-by: David Fries <david@fries.net> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/w1/slaves/w1_therm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 7de99df..2c8dff9 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -171,7 +171,7 @@ static ssize_t w1_therm_read(struct device *device,
int i, max_trying = 10;
ssize_t c = PAGE_SIZE;
- mutex_lock(&sl->master->mutex);
+ mutex_lock(&dev->mutex);
memset(rom, 0, sizeof(rom));
OpenPOWER on IntegriCloud