]> git.karo-electronics.de Git - karo-tx-linux.git/commit
watchdog: core: don't try to stop device if not running
authorHector Palacios <hector.palacios@digi.com>
Mon, 8 Apr 2013 15:06:32 +0000 (17:06 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 26 May 2013 16:50:49 +0000 (18:50 +0200)
commit64da82bf9fa60dbfc325bd925e5978fe0e51dd13
tree841ee4b7ace1e174659cfa7b116b00b5b31dcf31
parentb35c4576ba0d07e8f73327e99e9a0e48a6c23104
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>
drivers/watchdog/watchdog_dev.c