1 files changed, 25 insertions, 4 deletions

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index bbd1e357c23d..f4fd2e72add4 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -898,8 +898,22 @@ static struct platform_driver ramoops_driver = {
         },
 };
 
-static void ramoops_register_dummy(void)
+static inline void ramoops_unregister_dummy(void)
 {
+        platform_device_unregister(dummy);
+        dummy = NULL;
+
+        kfree(dummy_data);
+        dummy_data = NULL;
+}
+
+static void __init ramoops_register_dummy(void)
+{
+        /*
+         * Prepare a dummy platform data structure to carry the module
+         * parameters. If mem_size isn't set, then there are no module
+         * parameters, and we can skip this.
+         */
         if (!mem_size)
                 return;
 
@@ -932,21 +946,28 @@ static void ramoops_register_dummy(void)
         if (IS_ERR(dummy)) {
                 pr_info("could not create platform device: %ld\n",
                         PTR_ERR(dummy));
+                dummy = NULL;
+                ramoops_unregister_dummy();
         }
 }
 
 static int __init ramoops_init(void)
 {
+        int ret;
+
         ramoops_register_dummy();
-        return platform_driver_register(&ramoops_driver);
+        ret = platform_driver_register(&ramoops_driver);
+        if (ret != 0)
+                ramoops_unregister_dummy();
+
+        return ret;
 }
 late_initcall(ramoops_init);
 
 static void __exit ramoops_exit(void)
 {
         platform_driver_unregister(&ramoops_driver);
-        platform_device_unregister(dummy);
-        kfree(dummy_data);
+        ramoops_unregister_dummy();
 }
 module_exit(ramoops_exit);