Hi Ryang, > From: ryang <[email protected]> > > Signed-off-by: ryang <[email protected]> > --- > drivers/watchdog/watchdog_dev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c > index 6aaefba..73793d8 100644 > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -471,8 +471,8 @@ static int watchdog_release(struct inode *inode, struct > file *file) > */ > 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)) > + 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 */ > --
There is no reason for this change; you either have: 1) WDIOF_MAGICCLOSE is not supported and thus watchog may be stopped. 2) If a watchdog daemon crashes and thus closes the watchdog device (and thus it did not sent a Magic Char) then the watchdog should not be stopped but needs to reboot the system. Kind regards, Wim. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
