spi/mpc52xx: Fix error handling in probe function

The call to spi_master_put() is needed to free device memory. It must be called
after spi_alloc_master, and must only be called after the device memory is no
longer used.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index cb3a3830b0a53ef42d4f02d86bd16b6c5e3d7a16..a749589677be9d5a7702f2057239e50bf3af1819 100644 (file)
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -454,7 +454,7 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
                                GFP_KERNEL);
                if (!ms->gpio_cs) {
                        rc = -ENOMEM;
-                       goto err_alloc;
+                       goto err_alloc_gpio;
                }
 
                for (i = 0; i < ms->gpio_cs_count; i++) {
@@ -514,12 +514,13 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
 
  err_register:
        dev_err(&ms->master->dev, "initialization failed\n");
-       spi_master_put(master);
  err_gpio:
        while (i-- > 0)
                gpio_free(ms->gpio_cs[i]);
 
        kfree(ms->gpio_cs);
+ err_alloc_gpio:
+       spi_master_put(master);
  err_alloc:
  err_init:
        iounmap(regs);