diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-11 09:19:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-11 09:19:33 -0700 |
| commit | 87cf461cd30bc3e0ae48936a96590de8db747f54 (patch) | |
| tree | 5c996f1e1975e3c84eebf2c37648dd2aad6dbe50 | |
| parent | Merge tag 'dma-mapping-6.16-2025-07-11' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | PM: sleep: Call pm_restore_gfp_mask() after dpm_resume() (diff) | |
| download | linux-87cf461cd30bc3e0ae48936a96590de8db747f54.tar.gz linux-87cf461cd30bc3e0ae48936a96590de8db747f54.zip | |
Merge tag 'pm-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a coding mistake in a previous fix related to system suspend and
hibernation merged recently"
* tag 'pm-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: sleep: Call pm_restore_gfp_mask() after dpm_resume()
| -rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index bf77d28e959f..a6ab666ef48a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1236,8 +1236,8 @@ void dpm_complete(pm_message_t state) */ void dpm_resume_end(pm_message_t state) { - pm_restore_gfp_mask(); dpm_resume(state); + pm_restore_gfp_mask(); dpm_complete(state); } EXPORT_SYMBOL_GPL(dpm_resume_end); |