Skip to content

Commit

Permalink
staging: mei: resuming timer regardless of the watchdog timeout value.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oren Weil authored and Greg Kroah-Hartman committed Sep 9, 2011
1 parent a61c653 commit 6d70e93
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6d70e93

Please sign in to comment.