diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2012-06-11 12:18:31 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:34:31 -0700 |
| commit | 49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6 (patch) | |
| tree | 225a7c28cc7edceb2b5d51c012eb9f8bf4c809e5 /drivers/misc | |
| parent | misc: mei: Disable MSI when IRQ registration fails (diff) | |
| download | linux-dev-49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6.tar.xz linux-dev-49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6.zip | |
misc: mei: set WDIOF_ALARMONLY on mei watchdog
mei watchdog doesn't reboot the system it only produces event
therefore mark it as WDIOF_ALARMONLY.
This patch depends on:
commit 2bbeed016dd96045ec82c3a309afddcc3a0db1d2
Author: Alan Cox <alan@linux.intel.com>
watchdog: Add a flag to indicate the watchdog doesn't reboot things
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/wd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index 6be5605707b4..e2ec0505eb5c 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c @@ -341,7 +341,7 @@ static const struct watchdog_ops wd_ops = { }; static const struct watchdog_info wd_info = { .identity = INTEL_AMT_WATCHDOG_ID, - .options = WDIOF_KEEPALIVEPING, + .options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY, }; static struct watchdog_device amt_wd_dev = { |