From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Tue, 8 May 2007 07:31:20 +0000 (-0700)
Subject: w1: allow bus master to have reset and byte ops
X-Git-Tag: v2.6.22-rc1~617
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1f858b763de570a4ab119ade7b24ccbc8fad23a;p=linux-2.6

w1: allow bus master to have reset and byte ops

Signed-off-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 357a2e0f63..258defdb2e 100644
--- a/drivers/w1/w1_int.c
+++ b/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);
         }