diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 22:53:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 22:53:09 -0500 |
| commit | aa074c1c805a38c01c0dfe56f78d409e33be28a2 (patch) | |
| tree | 5a361535d8df880af24e02b1508c2a6b44ae17c5 /drivers/base | |
| parent | 7a962a4b6e86d27a7ba1c325a5981b52ad72c29b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into char-misc-next
We want these fixes in here as well.
Diffstat (limited to 'drivers/base')
| -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 8a97ddfa6122..c30df50e4440 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -1580,6 +1580,7 @@ static int fw_pm_notify(struct notifier_block *notify_block, | |||
| 1580 | switch (mode) { | 1580 | switch (mode) { |
| 1581 | case PM_HIBERNATION_PREPARE: | 1581 | case PM_HIBERNATION_PREPARE: |
| 1582 | case PM_SUSPEND_PREPARE: | 1582 | case PM_SUSPEND_PREPARE: |
| 1583 | case PM_RESTORE_PREPARE: | ||
| 1583 | kill_requests_without_uevent(); | 1584 | kill_requests_without_uevent(); |
| 1584 | device_cache_fw_images(); | 1585 | device_cache_fw_images(); |
| 1585 | break; | 1586 | break; |