diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2007-05-08 00:31:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:14 -0700 |
| commit | c1f858b763de570a4ab119ade7b24ccbc8fad23a (patch) | |
| tree | e1853c491eac0bd1522cca6d309814eb5c9b27d7 | |
| parent | 60ed34be8de04cc8082a163a665e01682c7bc937 (diff) | |
| download | linux-c1f858b763de570a4ab119ade7b24ccbc8fad23a.tar.gz linux-c1f858b763de570a4ab119ade7b24ccbc8fad23a.tar.bz2 linux-c1f858b763de570a4ab119ade7b24ccbc8fad23a.zip | |
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>
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |