---

yaml --- r: 288885 b: refs/heads/master c: f6e8a1d h: refs/heads/master i: 288883: 1f5ef74 v: v3
git-mirror · Feb 24, 2012 · 0a5eace · 0a5eace
1 parent 6967374
commit 0a5eace
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }