summaryrefslogtreecommitdiff
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-08-16 20:39:41 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 20:51:02 +0400
commitc8df72920c9cd8e43899a5660ee54a46ac2588a6 (patch)
tree83cdd96e741c11c6db5dce6c9087a8773dbee2f2 /drivers/misc/mei
parent9bb3a5897e22bf6af82bc451db9458b1d794f627 (diff)
downloadlinux-c8df72920c9cd8e43899a5660ee54a46ac2588a6.tar.xz
mei: wd: add option WDIOF_SETTIMEOUT
According watchdog-kernel-api.txt WDIOF_SETTIMEOUT should be set if the driver supplies set_timeout function Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r--drivers/misc/mei/wd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 3006cca34b16..94f2c0a12d94 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -341,7 +341,9 @@ static const struct watchdog_ops wd_ops = {
};
static const struct watchdog_info wd_info = {
.identity = INTEL_AMT_WATCHDOG_ID,
- .options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY,
+ .options = WDIOF_KEEPALIVEPING |
+ WDIOF_SETTIMEOUT |
+ WDIOF_ALARMONLY,
};
static struct watchdog_device amt_wd_dev = {