Skip to content

Commit

Permalink
watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
Browse files Browse the repository at this point in the history
commit 938626d upstream.

Implementation of ->set_timeout() is supposed to set 'timeout' field of 'struct
watchdog_device' passed to it. sp805 was rather setting this in a local
variable. Fix it.

Reported-by: Arun Ramamurthy <arun.ramamurthy@broadcom.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
vireshk authored and gregkh committed Jul 7, 2014
1 parent 0834497 commit e8b6433
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/watchdog/sp805_wdt.c
Expand Up @@ -62,7 +62,6 @@
* @adev: amba device structure of wdt
* @status: current status of wdt
* @load_val: load value to be set for current timeout
* @timeout: current programmed timeout
*/
struct sp805_wdt {
spinlock_t lock;
Expand All @@ -73,7 +72,6 @@ struct sp805_wdt {
#define WDT_BUSY 0
#define WDT_CAN_BE_CLOSED 1
unsigned int load_val;
unsigned int timeout;
};

/* local variables */
Expand Down Expand Up @@ -101,7 +99,7 @@ static void wdt_setload(unsigned int timeout)
spin_lock(&wdt->lock);
wdt->load_val = load;
/* roundup timeout to closest positive integer value */
wdt->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
wdd->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
spin_unlock(&wdt->lock);
}

Expand Down

0 comments on commit e8b6433

Please sign in to comment.