Commit 6d70e935 authored by Oren Weil's avatar Oren Weil Committed by Greg Kroah-Hartman
Browse files

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: default avatarOren Weil <oren.jer.weil@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a61c6530

drivers/staging/mei/main.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	/* 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);