---

yaml --- r: 268309 b: refs/heads/master c: 6d70e93 h: refs/heads/master i: 268307: 21f1e56 v: v3
git-mirror · Sep 9, 2011 · 16e4314 · 16e4314
1 parent 9f2d583
commit 16e4314
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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);