1 files changed, 26 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index ffdd8e963fb..dbc124e0564 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -314,11 +314,17 @@ static int __init ps3_setup_vuart_device(enum ps3_match_id match_id,
 
         result = ps3_system_bus_device_register(&p->dev);
 
-        if (result)
+        if (result) {
                 pr_debug("%s:%d ps3_system_bus_device_register failed\n",
                         __func__, __LINE__);
-
+                goto fail_device_register;
+        }
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return 0;
+
+fail_device_register:
+        kfree(p);
+        pr_debug(" <- %s:%d fail\n", __func__, __LINE__);
         return result;
 }
 
@@ -463,11 +469,17 @@ static int __init ps3_register_sound_devices(void)
 
         result = ps3_system_bus_device_register(&p->dev);
 
-        if (result)
+        if (result) {
                 pr_debug("%s:%d ps3_system_bus_device_register failed\n",
                         __func__, __LINE__);
-
+                goto fail_device_register;
+        }
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return 0;
+
+fail_device_register:
+        kfree(p);
+        pr_debug(" <- %s:%d failed\n", __func__, __LINE__);
         return result;
 }
 
@@ -485,17 +497,24 @@ static int __init ps3_register_graphics_devices(void)
         if (!p)
                 return -ENOMEM;
 
-        p->dev.match_id = PS3_MATCH_ID_GRAPHICS;
-        p->dev.match_sub_id = PS3_MATCH_SUB_ID_FB;
+        p->dev.match_id = PS3_MATCH_ID_GPU;
+        p->dev.match_sub_id = PS3_MATCH_SUB_ID_GPU_FB;
         p->dev.dev_type = PS3_DEVICE_TYPE_IOC0;
 
         result = ps3_system_bus_device_register(&p->dev);
 
-        if (result)
+        if (result) {
                 pr_debug("%s:%d ps3_system_bus_device_register failed\n",
                         __func__, __LINE__);
+                goto fail_device_register;
+        }
 
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return 0;
+
+fail_device_register:
+        kfree(p);
+        pr_debug(" <- %s:%d failed\n", __func__, __LINE__);
         return result;
 }