[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20070424095954.GA16473@2ka.mipt.ru>
Date: Tue, 24 Apr 2007 13:59:55 +0400
From: Evgeniy Polyakov <johnpol@....mipt.ru>
To: Andrew Morton <akpm@...l.org>
Cc: Matt Reimer <mreimer@...p.net>, linux-kernel@...r.kernel.org
Subject: [1/2] w1: allow bus master to have reset and byte ops.
Signed-off-by: Matt Reimer <mreimer@...p.net>
Signed-off-by: Evgeniy Polyakov <johnpol@....mipt.ru>
---
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 357a2e0..258defd 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);
}
--
Evgeniy Polyakov
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists