diff options
| author | Oren Weil <oren.jer.weil@intel.com> | 2011-09-07 09:03:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-09 13:28:21 -0700 |
| commit | 6d70e935596a51742ecc899b3d9629f11e506522 (patch) | |
| tree | e17623c125e2c767a495a660b6694deb19481247 /drivers/staging/mei | |
| parent | a61c6530a6e2fb74f3e1a80bd367412ac4aa6925 (diff) | |
staging: mei: resuming timer regardless of the watchdog timeout value.
the timer_work does not only handle watchdog but also handles mei timeouts.
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/mei')
| -rw-r--r-- | drivers/staging/mei/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c index 925de38adc8..eb05c36f45d 100644 --- a/drivers/staging/mei/main.c +++ b/drivers/staging/mei/main.c @@ -1151,11 +1151,9 @@ static int mei_pci_resume(struct device *device) mei_reset(dev, 1); mutex_unlock(&dev->device_lock); - /* Start watchdog if stopped in suspend */ - if (dev->wd_timeout) { - dev->wd_due_counter = 1; - schedule_delayed_work(&dev->timer_work, HZ); - } + /* Start timer if stopped in suspend */ + schedule_delayed_work(&dev->timer_work, HZ); + return err; } static SIMPLE_DEV_PM_OPS(mei_pm_ops, mei_pci_suspend, mei_pci_resume); |