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>
Thu, 11 Jul 2013 19:14:39 +0000 (21:14 +0200)
commitfcf95670fd29359a382e0755e573b36076d6283e
treef529d381c5f34de259208c52de6dcbd079f2a19a
parent5f314970b25a6960dd056b0038ffc7b88dc2973e
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