From c1f858b763de570a4ab119ade7b24ccbc8fad23a Mon Sep 17 00:00:00 2001 From: Evgeniy Polyakov Date: Tue, 8 May 2007 00:31:20 -0700 Subject: 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 --- drivers/w1/w1_int.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/w1/w1_int.c') diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 357a2e0f637a..258defdb2efd 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); } -- cgit v1.2.3