Merge tag 'mmc-fixes-for-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / kernel / power / hibernate.c

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 0a186cfde7884e6b4f0f3d09e1b3d549e29dafb8..e09dfbfeecee43ca7fff59c327f213f9605ef0f4 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -16,7 +16,6 @@
 #include <linux/string.h>
 #include <linux/device.h>
 #include <linux/async.h>
-#include <linux/kmod.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
@@ -611,14 +610,10 @@ int hibernate(void)
        if (error)
                goto Exit;
 
-       error = usermodehelper_disable();
-       if (error)
-               goto Exit;
-
        /* Allocate memory management structures */
        error = create_basic_memory_bitmaps();
        if (error)
-               goto Enable_umh;
+               goto Exit;
 
        printk(KERN_INFO "PM: Syncing filesystems ... ");
        sys_sync();
@@ -661,8 +656,6 @@ int hibernate(void)
 
  Free_bitmaps:
        free_basic_memory_bitmaps();
- Enable_umh:
-       usermodehelper_enable();
  Exit:
        pm_notifier_call_chain(PM_POST_HIBERNATION);
        pm_restore_console();
@@ -777,15 +770,9 @@ static int software_resume(void)
        if (error)
                goto close_finish;
 
-       error = usermodehelper_disable();
-       if (error)
-               goto close_finish;
-
        error = create_basic_memory_bitmaps();
-       if (error) {
-               usermodehelper_enable();
+       if (error)
                goto close_finish;
-       }
 
        pr_debug("PM: Preparing processes for restore.\n");
        error = freeze_processes();
@@ -806,7 +793,6 @@ static int software_resume(void)
        thaw_processes();
  Done:
        free_basic_memory_bitmaps();
-       usermodehelper_enable();
  Finish:
        pm_notifier_call_chain(PM_POST_RESTORE);
        pm_restore_console();