Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / mips / txx9 / generic / setup.c

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index a205e2ba8e7b4e65b442cc56349808f01d88f3f6..c860810722c0a1450a47a3268e9e520e97712efc 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -782,7 +782,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
                return;
        iocled->mmioaddr = ioremap(baseaddr, 1);
        if (!iocled->mmioaddr)
-               return;
+               goto out_free;
        iocled->chip.get = txx9_iocled_get;
        iocled->chip.set = txx9_iocled_set;
        iocled->chip.direction_input = txx9_iocled_dir_in;
@@ -791,13 +791,13 @@ void __init txx9_iocled_init(unsigned long baseaddr,
        iocled->chip.base = basenum;
        iocled->chip.ngpio = num;
        if (gpiochip_add(&iocled->chip))
-               return;
+               goto out_unmap;
        if (basenum < 0)
                basenum = iocled->chip.base;
 
        pdev = platform_device_alloc("leds-gpio", basenum);
        if (!pdev)
-               return;
+               goto out_gpio;
        iocled->pdata.num_leds = num;
        iocled->pdata.leds = iocled->leds;
        for (i = 0; i < num; i++) {
@@ -812,7 +812,16 @@ void __init txx9_iocled_init(unsigned long baseaddr,
        }
        pdev->dev.platform_data = &iocled->pdata;
        if (platform_device_add(pdev))
-               platform_device_put(pdev);
+               goto out_pdev;
+       return;
+out_pdev:
+       platform_device_put(pdev);
+out_gpio:
+       gpio_remove(&iocled->chip);
+out_unmap:
+       iounmap(iocled->mmioaddr);
+out_free:
+       kfree(iocled);
 }
 #else /* CONFIG_LEDS_GPIO */
 void __init txx9_iocled_init(unsigned long baseaddr,