Re: [PATCH v3] watchdog: core: don't try to stop device if not running

From: Wim Van Sebroeck
Date: Sun May 26 2013 - 12:51:48 EST


Hi Hector,

> 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@xxxxxxxx>
> ---
>
> Changes from v1:
> - Make it less intrusive with 'if/else if' clauses.
> - Change the logic of 'err' variable for better readability of code.
> - Remove one-liner if brackets that broke coding sytle.
> Changes from v2:
> - Revert "Change the logic of 'err'..." from v1 because otherwise the
> 'else if' can't be reached if the watchdog is running.
>
> drivers/watchdog/watchdog_dev.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>

Patch added to linux-watchdog-next.

Kind regards,
Wim.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/