From 45d1248e92d6ec087e2bcad8389a6a512eea4c5c Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Tue, 8 May 2007 00:31:20 -0700
Subject: [PATCH] --- yaml --- r: 54719 b: refs/heads/master c:
 c1f858b763de570a4ab119ade7b24ccbc8fad23a h: refs/heads/master i:   54717:
 ac6a890c5dbe6a0640f288a936e3fd82bc00ce3c   54715:
 610516055202496601f43e41445b9734ed3126a7   54711:
 512ee52909b81d15357613dbc16a1f0aa39f5a5d   54703:
 fb702a62415a9d5d835996ba5cf2e0aa58cb92a5   54687:
 596182687b21b47362ed29d620ae7df55d5d1f27   54655:
 96fa05069e3b6ca1b42e1f7d6995a4d86d1772a6 v: v3

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

diff --git a/[refs] b/[refs]
index f8fcea06a6d0..e1bb479e0719 100644
--- 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
index 357a2e0f637a..258defdb2efd 100644
--- 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);
         }