* [PATCH] p54spi: Release GPIO lines and IRQ on error in p54spi_probe
@ 2012-02-29 20:40 Max Filippov
2012-02-29 22:51 ` Christian Lamparter
0 siblings, 1 reply; 3+ messages in thread
From: Max Filippov @ 2012-02-29 20:40 UTC (permalink / raw)
To: linux-wireless; +Cc: chunkeey, larry.finger, Max Filippov
This makes it possible to reload driver if insmod has failed due to
missing firmware.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
drivers/net/wireless/p54/p54spi.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 7faed62..f792990 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -618,19 +618,19 @@ static int __devinit p54spi_probe(struct spi_device *spi)
ret = spi_setup(spi);
if (ret < 0) {
dev_err(&priv->spi->dev, "spi_setup failed");
- goto err_free_common;
+ goto err_free;
}
ret = gpio_request(p54spi_gpio_power, "p54spi power");
if (ret < 0) {
dev_err(&priv->spi->dev, "power GPIO request failed: %d", ret);
- goto err_free_common;
+ goto err_free;
}
ret = gpio_request(p54spi_gpio_irq, "p54spi irq");
if (ret < 0) {
dev_err(&priv->spi->dev, "irq GPIO request failed: %d", ret);
- goto err_free_common;
+ goto err_free_gpio_power;
}
gpio_direction_output(p54spi_gpio_power, 0);
@@ -641,7 +641,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
priv->spi);
if (ret < 0) {
dev_err(&priv->spi->dev, "request_irq() failed");
- goto err_free_common;
+ goto err_free_gpio_irq;
}
irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
@@ -673,6 +673,12 @@ static int __devinit p54spi_probe(struct spi_device *spi)
return 0;
err_free_common:
+ free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
+err_free_gpio_irq:
+ gpio_free(p54spi_gpio_irq);
+err_free_gpio_power:
+ gpio_free(p54spi_gpio_power);
+err_free:
p54_free_common(priv->hw);
return ret;
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] p54spi: Release GPIO lines and IRQ on error in p54spi_probe
2012-02-29 20:40 [PATCH] p54spi: Release GPIO lines and IRQ on error in p54spi_probe Max Filippov
@ 2012-02-29 22:51 ` Christian Lamparter
2012-03-01 9:00 ` Max Filippov
0 siblings, 1 reply; 3+ messages in thread
From: Christian Lamparter @ 2012-02-29 22:51 UTC (permalink / raw)
To: Max Filippov; +Cc: linux-wireless, chunkeey, larry.finger
On Wednesday, February 29, 2012 09:40:08 PM Max Filippov wrote:
> This makes it possible to reload driver if insmod has failed due to
> missing firmware.
>
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: stable <stable@vger.kernel.org>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
But I noticed something else... We never free the firmware
in the p54spi_probe errorpath either.
> ---
> drivers/net/wireless/p54/p54spi.c | 14 ++++++++++----
> 1 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
> index 7faed62..f792990 100644
> --- a/drivers/net/wireless/p54/p54spi.c
> +++ b/drivers/net/wireless/p54/p54spi.c
> @@ -618,19 +618,19 @@ static int __devinit p54spi_probe(struct spi_device *spi)
> ret = spi_setup(spi);
> if (ret < 0) {
> dev_err(&priv->spi->dev, "spi_setup failed");
> - goto err_free_common;
> + goto err_free;
> }
>
> ret = gpio_request(p54spi_gpio_power, "p54spi power");
> if (ret < 0) {
> dev_err(&priv->spi->dev, "power GPIO request failed: %d", ret);
> - goto err_free_common;
> + goto err_free;
> }
>
> ret = gpio_request(p54spi_gpio_irq, "p54spi irq");
> if (ret < 0) {
> dev_err(&priv->spi->dev, "irq GPIO request failed: %d", ret);
> - goto err_free_common;
> + goto err_free_gpio_power;
> }
>
> gpio_direction_output(p54spi_gpio_power, 0);
> @@ -641,7 +641,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
> priv->spi);
> if (ret < 0) {
> dev_err(&priv->spi->dev, "request_irq() failed");
> - goto err_free_common;
> + goto err_free_gpio_irq;
> }
>
> irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
> @@ -673,6 +673,12 @@ static int __devinit p54spi_probe(struct spi_device *spi)
> return 0;
>
> err_free_common:
> + free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
> +err_free_gpio_irq:
> + gpio_free(p54spi_gpio_irq);
> +err_free_gpio_power:
> + gpio_free(p54spi_gpio_power);
> +err_free:
> p54_free_common(priv->hw);
> return ret;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] p54spi: Release GPIO lines and IRQ on error in p54spi_probe
2012-02-29 22:51 ` Christian Lamparter
@ 2012-03-01 9:00 ` Max Filippov
0 siblings, 0 replies; 3+ messages in thread
From: Max Filippov @ 2012-03-01 9:00 UTC (permalink / raw)
To: Christian Lamparter; +Cc: linux-wireless, chunkeey, larry.finger
> But I noticed something else... We never free the firmware
> in the p54spi_probe errorpath either.
Firmware loading is going to change anyway.
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-01 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 20:40 [PATCH] p54spi: Release GPIO lines and IRQ on error in p54spi_probe Max Filippov
2012-02-29 22:51 ` Christian Lamparter
2012-03-01 9:00 ` Max Filippov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).