dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Oren Weil 2011-09-07 09:03:14 +03:00 committed by Greg Kroah-Hartman
parent a61c6530a6
commit 6d70e93559
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/mei/main.c
View File

@ -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);