diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /drivers/base/firmware_class.c | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index cb8b77917d7f..d276e33880be 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -1585,6 +1585,7 @@ static int fw_pm_notify(struct notifier_block *notify_block, | |||
| 1585 | switch (mode) { | 1585 | switch (mode) { |
| 1586 | case PM_HIBERNATION_PREPARE: | 1586 | case PM_HIBERNATION_PREPARE: |
| 1587 | case PM_SUSPEND_PREPARE: | 1587 | case PM_SUSPEND_PREPARE: |
| 1588 | case PM_RESTORE_PREPARE: | ||
| 1588 | kill_requests_without_uevent(); | 1589 | kill_requests_without_uevent(); |
| 1589 | device_cache_fw_images(); | 1590 | device_cache_fw_images(); |
| 1590 | break; | 1591 | break; |