diff options
| -rw-r--r-- | drivers/staging/mei/wd.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/jz4740_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/via_wdt.c | 6 | ||||
| -rw-r--r-- | drivers/watchdog/wm831x_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/wm8350_wdt.c | 1 |
7 files changed, 11 insertions, 3 deletions
diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c index a6910da78a6..cf4c29d10e7 100644 --- a/drivers/staging/mei/wd.c +++ b/drivers/staging/mei/wd.c @@ -323,6 +323,7 @@ static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev, unsigned int t mutex_lock(&dev->device_lock); dev->wd_timeout = timeout; + wd_dev->timeout = timeout; mei_wd_set_start_timeout(dev, dev->wd_timeout); mutex_unlock(&dev->device_lock); diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c index 28af416c3fb..978615ef899 100644 --- a/drivers/watchdog/jz4740_wdt.c +++ b/drivers/watchdog/jz4740_wdt.c @@ -109,6 +109,7 @@ static int jz4740_wdt_set_timeout(struct watchdog_device *wdt_dev, writeb(0x1, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE); + wdt_dev->timeout = new_timeout; return 0; } diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 3d9bb89776a..6b8432f61d0 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -121,6 +121,7 @@ static int pnx4008_wdt_stop(struct watchdog_device *wdd) static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, unsigned int new_timeout) { + wdd->timeout = new_timeout; return 0; } diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 96b598c52da..46c251d1893 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -201,6 +201,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou writel(count, wdt_base + S3C2410_WTDAT); writel(wtcon, wdt_base + S3C2410_WTCON); + wdd->timeout = timeout; + return 0; } diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index ef83f024241..465e08273c9 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -101,7 +101,7 @@ static void wdt_timer_tick(unsigned long data) static int wdt_ping(struct watchdog_device *wdd) { /* calculate when the next userspace timeout will be */ - next_heartbeat = jiffies + timeout * HZ; + next_heartbeat = jiffies + wdd->timeout * HZ; return 0; } @@ -109,7 +109,7 @@ static int wdt_start(struct watchdog_device *wdd) { unsigned int ctl = readl(wdt_mem); - writel(timeout, wdt_mem + VIA_WDT_COUNT); + writel(wdd->timeout, wdt_mem + VIA_WDT_COUNT); writel(ctl | VIA_WDT_RUNNING | VIA_WDT_TRIGGER, wdt_mem); wdt_ping(wdd); mod_timer(&timer, jiffies + WDT_HEARTBEAT); @@ -128,7 +128,7 @@ static int wdt_set_timeout(struct watchdog_device *wdd, unsigned int new_timeout) { writel(new_timeout, wdt_mem + VIA_WDT_COUNT); - timeout = new_timeout; + wdd->timeout = new_timeout; return 0; } diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c index b3e8a62f27a..b1815c5ed7a 100644 --- a/drivers/watchdog/wm831x_wdt.c +++ b/drivers/watchdog/wm831x_wdt.c @@ -163,6 +163,8 @@ static int wm831x_wdt_set_timeout(struct watchdog_device *wdt_dev, ret); } + wdt_dev->timeout = timeout; + return ret; } diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 0ce572c1565..3c76693447f 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -60,6 +60,7 @@ static int wm8350_wdt_set_timeout(struct watchdog_device *wdt_dev, wm8350_reg_lock(wm8350); mutex_unlock(&wdt_mutex); + wdt_dev->timeout = timeout; return ret; } |