lkml.org 
[lkml]   [2020]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v1 3/8] watchdog: f71808e_wdt: remove use of wrong watchdog_info option
On Thu, Jun 11, 2020 at 09:17:44PM +0200, Ahmad Fatoum wrote:
> 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>

> ---
> drivers/watchdog/f71808e_wdt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
> index c8ce80c13403..8e5584c54423 100644
> --- a/drivers/watchdog/f71808e_wdt.c
> +++ b/drivers/watchdog/f71808e_wdt.c
> @@ -690,8 +690,7 @@ static int __init watchdog_init(int sioaddr)
> * into the module have been registered yet.
> */
> watchdog.sioaddr = sioaddr;
> - watchdog.ident.options = WDIOC_SETTIMEOUT
> - | WDIOF_MAGICCLOSE
> + watchdog.ident.options = WDIOF_MAGICCLOSE
> | WDIOF_KEEPALIVEPING
> | WDIOF_CARDRESET;
>

\
 
 \ /
  Last update: 2020-06-30 23:08    [W:0.090 / U:0.724 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site