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>
This commit is contained in:
parent
60ed34be8d
commit
c1f858b763
1 changed files with 2 additions and 1 deletions
|
@ -100,7 +100,8 @@ int w1_add_master_device(struct w1_bus_master *master)
|
||||||
|
|
||||||
/* validate minimum functionality */
|
/* validate minimum functionality */
|
||||||
if (!(master->touch_bit && master->reset_bus) &&
|
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");
|
printk(KERN_ERR "w1_add_master_device: invalid function set\n");
|
||||||
return(-EINVAL);
|
return(-EINVAL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue