Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b10f7c12 authored by Hans de Goede's avatar Hans de Goede Committed by Wim Van Sebroeck
Browse files

watchdog: watchdog_dev: Let the driver update the timeout field on set_timeout success 



When a set_timeout operation succeeds this does not necessarily mean that
the exact timeout requested has been achieved, because the watchdog does not
necessarily have a 1 second resolution. So rather then have the core set
the timeout member of the watchdog_device struct to the exact requested
value, instead the driver should set it to the actually achieved timeout value.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent a5132caf

Documentation/watchdog/watchdog-kernel-api.txt

+4 −3
Original line number Diff line number Diff line
@@ -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

drivers/watchdog/watchdog_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -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) */