From 16e4314c65f8f6ed1ab7e63a8e54edd4e6fbd36a Mon Sep 17 00:00:00 2001
From: Oren Weil <oren.jer.weil@intel.com>
Date: Wed, 7 Sep 2011 09:03:14 +0300
Subject: [PATCH] --- yaml --- r: 268309 b: refs/heads/master c:
 6d70e935596a51742ecc899b3d9629f11e506522 h: refs/heads/master i:   268307:
 21f1e56e907f4e5013d858cac518394e066f8fb7 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/staging/mei/main.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 12107333c550..af8c856a01f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a61c6530a6e2fb74f3e1a80bd367412ac4aa6925
+refs/heads/master: 6d70e935596a51742ecc899b3d9629f11e506522
diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/staging/mei/main.c
index 925de38adc8f..eb05c36f45d4 100644
--- a/trunk/drivers/staging/mei/main.c
+++ b/trunk/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);