From 0da05b918db250c921241e75103cb5cfa653b200 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Fri, 19 Nov 2010 21:42:03 +0300 Subject: [PATCH] --- yaml --- r: 227062 b: refs/heads/master c: badb9533abbbba70df099765afe4ae432b442430 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/ifx6x60.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1cffc244b7a6..dae81984efc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c6a483275f47a2ef7119309ad3d791c10cf30da +refs/heads/master: badb9533abbbba70df099765afe4ae432b442430 diff --git a/trunk/drivers/serial/ifx6x60.c b/trunk/drivers/serial/ifx6x60.c index 803264aba3e3..3f8d5ee90a1b 100644 --- a/trunk/drivers/serial/ifx6x60.c +++ b/trunk/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: