summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEvgeniy Polyakov <zbr@ioremap.net>2009-01-07 18:09:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-08 08:31:14 -0800
commitf89735c4e281e8642907b38640c076ae5048f3a6 (patch)
tree24539b43a7f74d083d747edf5b4eec8e533baebe /drivers
parent325a06fb13614fd4e5ea36996c0ce043752a93a0 (diff)
downloadlwn-f89735c4e281e8642907b38640c076ae5048f3a6.tar.gz
lwn-f89735c4e281e8642907b38640c076ae5048f3a6.zip
w1: added w1 reset command
Command which allows to reset the bus. Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Cc: Paul Alfille <paul.alfille@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/w1/w1_netlink.c3
-rw-r--r--drivers/w1/w1_netlink.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index a94336be7654..f978c7504004 100644
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -197,6 +197,9 @@ static int w1_process_command_master(struct w1_master *dev, struct cn_msg *req_m
case W1_CMD_TOUCH:
err = w1_process_command_io(dev, msg, hdr, cmd);
break;
+ case W1_CMD_RESET:
+ err = w1_reset_bus(dev);
+ break;
default:
cmd->res = EINVAL;
cn_netlink_send(msg, 0, GFP_KERNEL);
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 01d86a71cf32..68a4ff46cb96 100644
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -58,6 +58,7 @@ enum w1_commands {
W1_CMD_SEARCH,
W1_CMD_ALARM_SEARCH,
W1_CMD_TOUCH,
+ W1_CMD_RESET,
W1_CMD_MAX,
};