]> git.kernelconcepts.de Git - mv-sheeva.git/commitdiff
serial: ifx6x60: free IRQ on error
authorVasiliy Kulikov <segoon@openwall.com>
Fri, 19 Nov 2010 18:42:03 +0000 (21:42 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 1 Dec 2010 01:25:45 +0000 (17:25 -0800)
If second request_irq() failed then the first IRQ must be freed in
error handling code.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/serial/ifx6x60.c

index 803264aba3e31f9b487a85b887a43aa227e50171..3f8d5ee90a1bc0160dae61cdd30f178378e4139f 100644 (file)
@@ -1133,7 +1133,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        if (ret) {
                dev_err(&spi->dev, "Unable to get irq %x",
                        gpio_to_irq(ifx_dev->gpio.srdy));
-               goto error_ret6;
+               goto error_ret7;
        }
 
        /* set pm runtime power state and register with power system */
@@ -1153,6 +1153,8 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
                mrdy_set_low(ifx_dev);
        return 0;
 
+error_ret7:
+       free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), (void *)ifx_dev);
 error_ret6:
        gpio_free(ifx_dev->gpio.srdy);
 error_ret5: