aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Karcher <kernel@mkarcher.dialup.fu-berlin.de>2018-04-19 14:05:21 +1200
committerDavid S. Miller <davem@davemloft.net>2018-04-19 16:11:10 -0400
commit9144c3795c2636351d553e4d0fc5297201182de2 (patch)
tree9e991583aeb58064d9f40e9ecc42a784938bc2de
parentnet-next: ax88796: Attach MII bus only when open (diff)
downloadlinux-dev-9144c3795c2636351d553e4d0fc5297201182de2.tar.xz
linux-dev-9144c3795c2636351d553e4d0fc5297201182de2.zip
net-next: ax88796: Do not free IRQ in ax_remove() (already freed in ax_close()).
This complements the fix in 82533ad9a1c ("net: ethernet: ax88796: don't call free_irq without request_irq first") that removed the free_irq call in the error path of probe, to also not call free_irq when remove is called to revert the effects of probe. Fixes: 82533ad9a1c (net: ethernet: ax88796: don't call free_irq without request_irq first) Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/8390/ax88796.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index ab020e601ec9..d3f30f1c40b2 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -790,7 +790,6 @@ static int ax_remove(struct platform_device *pdev)
struct resource *mem;
unregister_netdev(dev);
- free_irq(dev->irq, dev);
iounmap(ei_local->mem);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);