From f40a52dc130b3e6080bc81cabb6bc53a9d9bfec3 Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 15 Oct 2008 22:04:52 -0700
Subject: [PATCH] --- yaml --- r: 114927 b: refs/heads/master c:
 e0d29c7699de723432da268748aefe9624fc8529 h: refs/heads/master i:   114925:
 690af839b79a69d5d7ce1389061a8484e03baf27   114923:
 c9588cad1373730f88d410e43d2e096534483a78   114919:
 aed2c0968d5f2da2e47ef7ac00c8f89365ec047b   114911:
 b46d36d2080a2be3eed58e1d4033a3ce80c092bb v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/w1/slaves/w1_therm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77e32276086a..e2c5c8f9ddbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe3cb82364332b9db3b574e9e41de9c27eff470a
+refs/heads/master: e0d29c7699de723432da268748aefe9624fc8529
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
index 7de99dfd11c8..2c8dff9f77da 100644
--- a/trunk/drivers/w1/slaves/w1_therm.c
+++ b/trunk/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));