diff options
| author |   Masakazu Mokuno <mokuno@sm.sony.co.jp> | 2008-10-30 08:17:18 +0000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2008-11-06 09:49:35 +1100 |
| commit | d4ad304841a9790d4fa35e51d6aa9baeba631559 (patch) | |
| tree | 04a8b4198ec92b70c0eb244155c664c0c4a95818 /arch/powerpc/platforms/ps3/device-init.c | |
| parent | powerpc: Eliminate unused do_gtod variable (diff) | |
| download | linux-dev-d4ad304841a9790d4fa35e51d6aa9baeba631559.tar.xz linux-dev-d4ad304841a9790d4fa35e51d6aa9baeba631559.zip | |
powerpc/ps3: Fix memory leak in device init
Free dynamically allocated device data structures when device registration
fails. This fixes memory leakage when the registration fails.
Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/ps3/device-init.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/device-init.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c index ffdd8e963fbd..43816da25ca6 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; } @@ -491,11 +503,18 @@ static int __init ps3_register_graphics_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; } |