diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:24:43 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:24:43 +0100 |
| commit | 2c2e5bb97544198a62e4edbf6aca5dd201979564 (patch) | |
| tree | ffb927ea311d86aeee3a0ef561d6218280c038cb /drivers/base/power/main.c | |
| parent | 9b6872a123862cecd19a958f08eb9848b6a4240d (diff) | |
| parent | 6311d329e12a358a9813d2e929d26fbc5a4c73c2 (diff) | |
| download | talos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.tar.gz talos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.zip | |
Merge branch 'for-5.1/hid-asus' into for-linus
Asus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index a690fd400260..0992e67e862b 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -32,6 +32,7 @@ #include <trace/events/power.h> #include <linux/cpufreq.h> #include <linux/cpuidle.h> +#include <linux/devfreq.h> #include <linux/timer.h> #include "../base.h" @@ -1078,6 +1079,7 @@ void dpm_resume(pm_message_t state) dpm_show_time(starttime, state, 0, NULL); cpufreq_resume(); + devfreq_resume(); trace_suspend_resume(TPS("dpm_resume"), state.event, false); } @@ -1852,6 +1854,7 @@ int dpm_suspend(pm_message_t state) trace_suspend_resume(TPS("dpm_suspend"), state.event, true); might_sleep(); + devfreq_suspend(); cpufreq_suspend(); mutex_lock(&dpm_list_mtx); |
