From 0a5eace2366313297185361f6d6e16043a208952 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sun, 19 Feb 2012 13:10:00 +1100
Subject: [PATCH] --- yaml --- r: 288885 b: refs/heads/master c:
 f6e8a1d7b4c4087e13913da43deb45b3e3413f29 h: refs/heads/master i:   288883:
 1f5ef74e2041d98a67da24158fe8637fd5bced6a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/w1/slaves/w1_bq27000.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fdfebc99008c..f41c9fd25902 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df7019f37053bb5357907ec2d1fd516304f38348
+refs/heads/master: f6e8a1d7b4c4087e13913da43deb45b3e3413f29
diff --git a/trunk/drivers/w1/slaves/w1_bq27000.c b/trunk/drivers/w1/slaves/w1_bq27000.c
index 6ae60aa1315b..52ad812fa1e7 100644
--- a/trunk/drivers/w1/slaves/w1_bq27000.c
+++ b/trunk/drivers/w1/slaves/w1_bq27000.c
@@ -31,8 +31,10 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
 	u8 val;
 	struct w1_slave *sl = container_of(dev->parent, struct w1_slave, dev);
 
+	mutex_lock(&sl->master->mutex);
 	w1_write_8(sl->master, HDQ_CMD_READ | reg);
 	val = w1_read_8(sl->master);
+	mutex_unlock(&sl->master->mutex);
 
 	return val;
 }