From db5356a2d62c033a47e034715b8e21c3c8aa2279 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 12 Sep 2011 11:56:59 +0200 Subject: [PATCH] --- yaml --- r: 296781 b: refs/heads/master c: b10f7c12e051762b84457f6d38d4b71acbf76a02 h: refs/heads/master i: 296779: 61e01062f0feba68d07d3b1c389697fff53d96ac v: v3 --- [refs] | 2 +- trunk/Documentation/watchdog/watchdog-kernel-api.txt | 7 ++++--- trunk/drivers/watchdog/watchdog_dev.c | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b451969227b6..d991e63d3980 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5132cafc0a739107e51494b9054c0066802b8cd +refs/heads/master: b10f7c12e051762b84457f6d38d4b71acbf76a02 diff --git a/trunk/Documentation/watchdog/watchdog-kernel-api.txt b/trunk/Documentation/watchdog/watchdog-kernel-api.txt index 9e162465b0cf..7d9d1da762b6 100644 --- a/trunk/Documentation/watchdog/watchdog-kernel-api.txt +++ b/trunk/Documentation/watchdog/watchdog-kernel-api.txt @@ -117,9 +117,10 @@ they are supported. These optional routines/operations are: status of the device is reported with watchdog WDIOF_* status flags/bits. * set_timeout: this routine checks and changes the timeout of the watchdog timer device. It returns 0 on success, -EINVAL for "parameter out of range" - and -EIO for "could not write value to the watchdog". On success the timeout - value of the watchdog_device will be changed to the value that was just used - to re-program the watchdog timer device. + and -EIO for "could not write value to the watchdog". On success this + routine should set the timeout value of the watchdog_device to the + achieved timeout value (which may be different from the requested one + because the watchdog does not necessarily has a 1 second resolution). (Note: the WDIOF_SETTIMEOUT needs to be set in the options field of the watchdog's info structure). * ioctl: if this routine is present then it will be called first before we do diff --git a/trunk/drivers/watchdog/watchdog_dev.c b/trunk/drivers/watchdog/watchdog_dev.c index 55b1f60b19d2..c6e1b8dd80cc 100644 --- a/trunk/drivers/watchdog/watchdog_dev.c +++ b/trunk/drivers/watchdog/watchdog_dev.c @@ -226,7 +226,6 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, err = wdd->ops->set_timeout(wdd, val); if (err < 0) return err; - wdd->timeout = val; /* If the watchdog is active then we send a keepalive ping * to make sure that the watchdog keep's running (and if * possible that it takes the new timeout) */