diff options
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index db677199403..7ae6fe414c3 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -60,7 +60,8 @@ void device_pm_init(struct device *dev)  	dev->power.status = DPM_ON;  	init_completion(&dev->power.completion);  	complete_all(&dev->power.completion); -	dev->power.wakeup_count = 0; +	dev->power.wakeup = NULL; +	spin_lock_init(&dev->power.lock);  	pm_runtime_init(dev);  } @@ -120,6 +121,7 @@ void device_pm_remove(struct device *dev)  	mutex_lock(&dpm_list_mtx);  	list_del_init(&dev->power.entry);  	mutex_unlock(&dpm_list_mtx); +	device_wakeup_disable(dev);  	pm_runtime_remove(dev);  }  |