Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus

[karo-tx-linux.git] / drivers / watchdog / jz4740_wdt.c

diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 28af416c3fbf34eae07d4e9951cf10a6e78ca75c..978615ef899d5e52dfb403dd583762fa5cd5fbae 100644 (file)
--- 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;
 }