From 6d70e935596a51742ecc899b3d9629f11e506522 Mon Sep 17 00:00:00 2001 From: Oren Weil Date: Wed, 7 Sep 2011 09:03:14 +0300 Subject: [PATCH] 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 Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mei/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c index 925de38..eb05c36 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); -- 2.7.4