| From e871e93fb08a619dfc015974a05768ed6880fd82 Mon Sep 17 00:00:00 2001 |
| From: Ahmad Fatoum <a.fatoum@pengutronix.de> |
| Date: Thu, 11 Jun 2020 21:17:43 +0200 |
| Subject: [PATCH] watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in |
| watchdog_info.options |
| |
| commit e871e93fb08a619dfc015974a05768ed6880fd82 upstream. |
| |
| 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> |
| |
| diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c |
| index a3c44d75d80e..c8ce80c13403 100644 |
| --- a/drivers/watchdog/f71808e_wdt.c |
| +++ b/drivers/watchdog/f71808e_wdt.c |
| @@ -692,7 +692,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", |
| -- |
| 2.27.0 |
| |
