* [PATCH net] net: ethernet: ax88796: don't call free_irq without request_irq first
@ 2017-05-25 20:54 Uwe Kleine-König
2017-05-26 18:57 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2017-05-25 20:54 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, kernel, Ben Dooks
The function ax_init_dev (which is called only from the driver's .probe
function) calls free_irq in the error path without having requested the
irq in the first place. So drop the free_irq call in the error path.
Fixes: 825a2ff1896e ("AX88796 network driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/8390/ax88796.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index b0a3b85fc6f8..db02bc2fb4b2 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -748,13 +748,13 @@ static int ax_init_dev(struct net_device *dev)
ret = ax_mii_init(dev);
if (ret)
- goto out_irq;
+ goto err_out;
ax_NS8390_init(dev, 0);
ret = register_netdev(dev);
if (ret)
- goto out_irq;
+ goto err_out;
netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n",
ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr,
@@ -762,9 +762,6 @@ static int ax_init_dev(struct net_device *dev)
return 0;
- out_irq:
- /* cleanup irq */
- free_irq(dev->irq, dev);
err_out:
return ret;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: ethernet: ax88796: don't call free_irq without request_irq first
2017-05-25 20:54 [PATCH net] net: ethernet: ax88796: don't call free_irq without request_irq first Uwe Kleine-König
@ 2017-05-26 18:57 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-05-26 18:57 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: netdev, kernel, ben.dooks
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu, 25 May 2017 22:54:53 +0200
> The function ax_init_dev (which is called only from the driver's .probe
> function) calls free_irq in the error path without having requested the
> irq in the first place. So drop the free_irq call in the error path.
>
> Fixes: 825a2ff1896e ("AX88796 network driver")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-26 18:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-25 20:54 [PATCH net] net: ethernet: ax88796: don't call free_irq without request_irq first Uwe Kleine-König
2017-05-26 18:57 ` David Miller
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).