summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorVasiliy Kulikov <segoon@openwall.com>2010-11-19 21:42:03 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-30 17:25:45 -0800
commitbadb9533abbbba70df099765afe4ae432b442430 (patch)
tree404f47551e7c777fdc02df62437d35cb4aae4413 /drivers/serial
parent3c6a483275f47a2ef7119309ad3d791c10cf30da (diff)
downloadlinux-badb9533abbbba70df099765afe4ae432b442430.tar.gz
linux-badb9533abbbba70df099765afe4ae432b442430.tar.bz2
linux-badb9533abbbba70df099765afe4ae432b442430.zip
serial: ifx6x60: free IRQ on error
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>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/ifx6x60.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/ifx6x60.c b/drivers/serial/ifx6x60.c
index 803264aba3e3..3f8d5ee90a1b 100644
--- a/drivers/serial/ifx6x60.c
+++ b/drivers/serial/ifx6x60.c
@@ -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: