forked from Minki/linux
watchdog: core: don't try to stop device if not running
A watchdog device may be stopped from userspace using WDIOC_SETOPTIONS ioctl and flag WDIOS_DISABLECARD. If the device is closed after this operation, watchdog_release() is called and status bits checked for stopping it. Besides, if the device has not been unregistered a critical message "watchdog did not stop!" is printed, although the ioctl may have successfully stopped it already. Without the patch a user application sample code like this will successfully stop the watchdog, but the kernel will output the message "watchdog did not stop!": wd_fd = open("/dev/watchdog", O_RDWR); flags = WDIOS_DISABLECARD; ioctl(wd_fd, WDIOC_SETOPTIONS, &flags); close(wd_fd); Signed-off-by: Hector Palacios <hector.palacios@digi.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
5f314970b2
commit
fcf95670fd
@ -469,8 +469,10 @@ static int watchdog_release(struct inode *inode, struct file *file)
|
||||
* or if WDIOF_MAGICCLOSE is not set. If nowayout was set then
|
||||
* watchdog_stop will fail.
|
||||
*/
|
||||
if (test_and_clear_bit(WDOG_ALLOW_RELEASE, &wdd->status) ||
|
||||
!(wdd->info->options & WDIOF_MAGICCLOSE))
|
||||
if (!test_bit(WDOG_ACTIVE, &wdd->status))
|
||||
err = 0;
|
||||
else if (test_and_clear_bit(WDOG_ALLOW_RELEASE, &wdd->status) ||
|
||||
!(wdd->info->options & WDIOF_MAGICCLOSE))
|
||||
err = watchdog_stop(wdd);
|
||||
|
||||
/* If the watchdog was not stopped, send a keepalive ping */
|
||||
|
Loading…
Reference in New Issue
Block a user