From: Michael Schmitz <schmitzmic@gmail.com>
To: linux-m68k@vger.kernel.org
Cc: geert@linux-m68k.org, debian-68k@lists.debian.org,
kernel@mkarcher.dialup.fu-berlin.de,
Michael Karcher <debian@mkarcher.dialup.fu-berlin.de>,
Michael Schmitz <schmitzmic@gmail.com>
Subject: [PATCH 4/8] ax88796: Do not free IRQ that did not get requested
Date: Tue, 17 Nov 2015 12:33:13 +1300 [thread overview]
Message-ID: <1447716797-20906-5-git-send-email-schmitzmic@gmail.com> (raw)
In-Reply-To: <1447716797-20906-1-git-send-email-schmitzmic@gmail.com>
From: Michael Karcher <debian@mkarcher.dialup.fu-berlin.de>
The irq is request on netdev open time, so do not free it in probe
if something fails.
Also do not free the irq in remove, as it got already freed in close
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
---
drivers/net/ethernet/8390/ax88796.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 544f3ba..6472473 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -802,7 +802,7 @@ static int ax_init_dev(struct net_device *dev)
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,
@@ -810,9 +810,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;
}
@@ -825,7 +822,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);
--
1.7.0.4
next prev parent reply other threads:[~2015-11-16 23:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-16 23:33 [PATCH 0/8] Amiga XSurf100 patch series, to be submitted to linux-net Michael Schmitz
2015-11-16 23:33 ` [PATCH 1/8] aX88796: Fix MAC address reading Michael Schmitz
2015-11-16 23:33 ` [PATCH 2/8] ax88796: Attach MII bus only when open Michael Schmitz
2015-11-16 23:33 ` [PATCH 3/8] ax88796: Move mii support functions upwards to prevent need of forward declaration Michael Schmitz
2015-11-16 23:33 ` Michael Schmitz [this message]
2015-11-16 23:33 ` [PATCH 5/8] ax88796: Add block_input/output hooks to ax_plat_data Michael Schmitz
2015-11-16 23:33 ` [PATCH 6/8] ax88796: add interrupt status callback to platform data Michael Schmitz
2015-11-16 23:33 ` [PATCH 7/8] ax88796: Add X-Surf 100 zorro driver providing an ax88796 platform device Michael Schmitz
2015-11-17 8:16 ` Geert Uytterhoeven
2015-11-17 17:59 ` Michael Karcher
2015-11-17 20:01 ` Geert Uytterhoeven
2015-11-16 23:33 ` [PATCH 8/8] ax88796: use interrupt status callback for XSurf100 driver Michael Schmitz
2015-11-17 8:18 ` [PATCH 0/8] Amiga XSurf100 patch series, to be submitted to linux-net Geert Uytterhoeven
2015-11-17 18:16 ` Michael Karcher
2015-11-17 20:02 ` Geert Uytterhoeven
2015-11-18 1:52 ` Michael Schmitz
2015-11-18 8:09 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447716797-20906-5-git-send-email-schmitzmic@gmail.com \
--to=schmitzmic@gmail.com \
--cc=debian-68k@lists.debian.org \
--cc=debian@mkarcher.dialup.fu-berlin.de \
--cc=geert@linux-m68k.org \
--cc=kernel@mkarcher.dialup.fu-berlin.de \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox