summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2012-02-29 20:20:58 +0100
committerWim Van Sebroeck <wim@iguana.be>2012-03-27 20:08:09 +0200
commit0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c (patch)
tree266ad74d44c332e27eac61070f7287051035136f /drivers/staging
parentb10f7c12e051762b84457f6d38d4b71acbf76a02 (diff)
downloadlinux-0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c.tar.bz2
watchdog: fix set_timeout operations
Since we changed the behaviour of the set_timeout operation in the watchdog API, we need to change the allready converted drivers so that they update the timeout field at the end of the set_timeout operation. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/mei/wd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
index a6910da78a64..cf4c29d10e7f 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);