Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Oren Weil and committed by
Greg Kroah-Hartman
6d70e935 a61c6530

+3 -5
+3 -5
drivers/staging/mei/main.c
··· 1151 1151 mei_reset(dev, 1); 1152 1152 mutex_unlock(&dev->device_lock); 1153 1153 1154 - /* Start watchdog if stopped in suspend */ 1155 - if (dev->wd_timeout) { 1156 - dev->wd_due_counter = 1; 1157 - schedule_delayed_work(&dev->timer_work, HZ); 1158 - } 1154 + /* Start timer if stopped in suspend */ 1155 + schedule_delayed_work(&dev->timer_work, HZ); 1156 + 1159 1157 return err; 1160 1158 } 1161 1159 static SIMPLE_DEV_PM_OPS(mei_pm_ops, mei_pci_suspend, mei_pci_resume);