From: Evgeniy Polyakov 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: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1f858b763de570a4ab119ade7b24ccbc8fad23a;p=linux-2.6-omap-h63xx.git w1: allow bus master to have reset and byte ops Signed-off-by: Matt Reimer Signed-off-by: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 357a2e0f637..258defdb2ef 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); }