---

yaml --- r: 54719 b: refs/heads/master c: c1f858b h: refs/heads/master i: 54717: ac6a890 54715: 6105160 54711: 512ee52 54703: fb702a6 54687: 5961826 54655: 96fa050 v: v3
git-mirror · May 8, 2007 · 45d1248 · 45d1248
1 parent 236966f
commit 45d1248
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60ed34be8de04cc8082a163a665e01682c7bc937
+refs/heads/master: c1f858b763de570a4ab119ade7b24ccbc8fad23a
diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c
@@ -100,7 +100,8 @@ int w1_add_master_device(struct w1_bus_master *master)
 
         /* validate minimum functionality */
         if (!(master->touch_bit && master->reset_bus) &&
-            !(master->write_bit && master->read_bit)) {
+            !(master->write_bit && master->read_bit) &&
+	    !(master->write_byte && master->read_byte && master->reset_bus)) {
 		printk(KERN_ERR "w1_add_master_device: invalid function set\n");
 		return(-EINVAL);
         }