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>

diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c
index 925de38adc8f6f4969956d764117addbd4f901ab..eb05c36f45d4181f0fb7c4df36165a9a9dd87e8f 100644 (file)
--- 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);