diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 04:53:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 04:53:09 +0100 |
| commit | aa074c1c805a38c01c0dfe56f78d409e33be28a2 (patch) | |
| tree | 5a361535d8df880af24e02b1508c2a6b44ae17c5 /drivers/base | |
| parent | memory: ti-aemif: add bindings for AEMIF driver (diff) | |
| parent | Linux 3.14-rc5 (diff) | |
| download | linux-aa074c1c805a38c01c0dfe56f78d409e33be28a2.tar.xz linux-aa074c1c805a38c01c0dfe56f78d409e33be28a2.zip | |
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, switch (mode) { case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: + case PM_RESTORE_PREPARE: kill_requests_without_uevent(); device_cache_fw_images(); break; |