---

yaml --- r: 318191 b: refs/heads/master c: 59d4467 h: refs/heads/master i: 318189: eeef171 318187: 037b60d 318183: 9132f87 318175: 27e4f68 v: v3
git-mirror · Jun 12, 2012 · ad6d4ab · ad6d4ab
1 parent a725c24
commit ad6d4ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd4034df8b37841eeaf7b05f86e732ab8e0b08a
+refs/heads/master: 59d4467be405316916a4087d5b02d99196eeef04
diff --git a/trunk/drivers/w1/slaves/w1_bq27000.c b/trunk/drivers/w1/slaves/w1_bq27000.c
@@ -31,10 +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);
+	mutex_lock(&sl->mutex);
 	w1_write_8(sl->master, HDQ_CMD_READ | reg);
 	val = w1_read_8(sl->master);
-	mutex_unlock(&sl->master->mutex);
+	mutex_unlock(&sl->mutex);
 
 	return val;
 }

diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -688,6 +688,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
 	memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
 	atomic_set(&sl->refcnt, 0);
 	init_completion(&sl->released);
+	mutex_init(&sl->mutex);
 
 	spin_lock(&w1_flock);
 	f = w1_family_registered(rn->family);

diff --git a/trunk/drivers/w1/w1.h b/trunk/drivers/w1/w1.h
@@ -75,6 +75,7 @@ struct w1_slave
 	void			*family_data;
 	struct device		dev;
 	struct completion	released;
+	struct mutex		mutex;
 };
 
 typedef void (*w1_slave_found_callback)(struct w1_master *, u64);