From: Oren Weil <oren.jer.weil@intel.com>
Date: Wed, 7 Sep 2011 06:03:14 +0000 (+0300)
Subject: staging: mei: resuming timer regardless of the watchdog timeout value.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d70e935596a51742ecc899b3d9629f11e506522;p=linux-beck.git

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 925de38adc8f..eb05c36f45d4 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);