Commit c1f858b7 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Linus Torvalds
Browse files

w1: allow bus master to have reset and byte ops 



Signed-off-by: default avatarMatt Reimer <mreimer@vpop.net>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 60ed34be

drivers/w1/w1_int.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }