Commit 2e483c87 authored by Moritz Fischer's avatar Moritz Fischer Committed by Greg Kroah-Hartman

rtc: ds1374: wdt: Fix stop/start ioctl always returning -EINVAL


[ Upstream commit 538c08f4 ]

The WDIOC_SETOPTIONS case in the watchdog ioctl would alwayss falls
through to the -EINVAL case. This is wrong since thew watchdog does
actually get stopped or started correctly.

Fixes: 920f91e5 ("drivers/rtc/rtc-ds1374.c: add watchdog support")
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f20cb85e
...@@ -548,14 +548,15 @@ static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -548,14 +548,15 @@ static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd,
if (options & WDIOS_DISABLECARD) { if (options & WDIOS_DISABLECARD) {
pr_info("disable watchdog\n"); pr_info("disable watchdog\n");
ds1374_wdt_disable(); ds1374_wdt_disable();
return 0;
} }
if (options & WDIOS_ENABLECARD) { if (options & WDIOS_ENABLECARD) {
pr_info("enable watchdog\n"); pr_info("enable watchdog\n");
ds1374_wdt_settimeout(wdt_margin); ds1374_wdt_settimeout(wdt_margin);
ds1374_wdt_ping(); ds1374_wdt_ping();
return 0;
} }
return -EINVAL; return -EINVAL;
} }
return -ENOTTY; return -ENOTTY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment