iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: f71808e_wdt: remove use of wrong watchdog_info option

Browse Source 
The flags that should be or-ed into the watchdog_info.options by drivers
all start with WDIOF_, e.g. WDIOF_SETTIMEOUT, which indicates that the
driver's watchdog_ops has a usable set_timeout.

WDIOC_SETTIMEOUT was used instead, which expands to 0xc0045706, which
equals:

   WDIOF_FANFAULT | WDIOF_EXTERN1 | WDIOF_PRETIMEOUT | WDIOF_ALARMONLY |
   WDIOF_MAGICCLOSE | 0xc0045000

These were so far indicated to userspace on WDIOC_GETSUPPORT.
As the driver has not yet been migrated to the new watchdog kernel API,
the constant can just be dropped without substitute.

Fixes: 96cb4eb019ce ("watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG")
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-4-a.fatoum@pengutronix.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Ahmad Fatoum 2020-06-11 21:17:44 +02:00 committed by Wim Van Sebroeck
parent e871e93fb0
commit 802141462d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/watchdog/f71808e_wdt.c
View File

@ -690,8 +690,7 @@ static int __init watchdog_init(int sioaddr)
* into the module have been registered yet. * into the module have been registered yet.
*/ */
watchdog.sioaddr = sioaddr; watchdog.sioaddr = sioaddr;
watchdog.ident.options = WDIOC_SETTIMEOUT watchdog.ident.options = WDIOF_MAGICCLOSE
| WDIOF_MAGICCLOSE
| WDIOF_KEEPALIVEPING | WDIOF_KEEPALIVEPING
| WDIOF_CARDRESET; | WDIOF_CARDRESET;