Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203dbe7c authored by Ahmad Fatoum's avatar Ahmad Fatoum Committed by Greg Kroah-Hartman
Browse files

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: b97cb21a ("watchdog: f71808e_wdt: Fix WDTMOUT_STS register read")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@pengutronix.de


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c98c4a0

drivers/watchdog/f71808e_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -690,7 +690,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",