The patch titled
w1: allow bus master to have reset and byte ops
has been added to the -mm tree. Its filename is
w1-allow-bus-master-to-have-reset-and-byte-ops.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: w1: allow bus master to have reset and byte ops
From: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Signed-off-by: Matt Reimer <mreimer@xxxxxxxx>
Signed-off-by: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/w1/w1_int.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/w1/w1_int.c~w1-allow-bus-master-to-have-reset-and-byte-ops drivers/w1/w1_int.c
--- a/drivers/w1/w1_int.c~w1-allow-bus-master-to-have-reset-and-byte-ops
+++ a/drivers/w1/w1_int.c
@@ -100,7 +100,8 @@ int w1_add_master_device(struct w1_bus_m
/* 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);
}
_
Patches currently in -mm which might be from johnpol@xxxxxxxxxxx are
w1-printk-format-warning.patch
w1-allow-bus-master-to-have-reset-and-byte-ops.patch
driver-for-the-maxim-ds1wm-a-1-wire-bus-master-asic-core.patch
use-menuconfig-objects-connector.patch
use-menuconfig-objects-w1.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
