diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-06-11 21:17:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-26 10:27:07 +0200 |
| commit | 53a29e11b2ef75e454f88afc7cecf3998924a8e3 (patch) | |
| tree | c4c299dec04ad89490e874bb06866347614d4885 | |
| parent | 34c2166235171162c55ccdc2f3f77b377da76d7c (diff) | |
| download | linux-stable-53a29e11b2ef75e454f88afc7cecf3998924a8e3.tar.gz linux-stable-53a29e11b2ef75e454f88afc7cecf3998924a8e3.tar.bz2 linux-stable-53a29e11b2ef75e454f88afc7cecf3998924a8e3.zip | |
watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
[ Upstream commit e871e93fb08a619dfc015974a05768ed6880fd82 ]
The driver supports populating bootstatus with WDIOF_CARDRESET, but so
far userspace couldn't portably determine whether absence of this flag
meant no watchdog reset or no driver support. Or-in the bit to fix this.
Fixes: b97cb21a4634 ("watchdog: f71808e_wdt: Fix WDTMOUT_STS register read")
Cc: stable@vger.kernel.org
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@pengutronix.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/watchdog/f71808e_wdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index 2048aad91add..3577e356e08c 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -644,7 +644,8 @@ static int __init watchdog_init(int sioaddr) watchdog.sioaddr = sioaddr; watchdog.ident.options = WDIOC_SETTIMEOUT | WDIOF_MAGICCLOSE - | WDIOF_KEEPALIVEPING; + | WDIOF_KEEPALIVEPING + | WDIOF_CARDRESET; snprintf(watchdog.ident.identity, sizeof(watchdog.ident.identity), "%s watchdog", |