From: Chris Metcalf <cmetcalf@tilera.com>
To: Stephen Hemminger <shemminger@vyatta.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] marvell sky2 driver: fix irq number assignment bug
Date: Tue, 3 Apr 2012 11:10:14 -0400 [thread overview]
Message-ID: <201204031526.q33FQvFO031746@farm-0027.internal.tilera.com> (raw)
Fix a minor bug that will display wrong IRQ number in ifconfig output.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
drivers/net/ethernet/marvell/sky2.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 423a1a2..879b0a4 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4978,6 +4978,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
goto err_out_free_netdev;
}
+ /*
+ * Need to set the IRQ # for the net_device here again after
+ * setting it in sky2_init_netdev() initially, because MSI
+ * will assign a new IRQ # to this PCI device.
+ */
+ dev->irq = hw->pdev->irq;
+
err = register_netdev(dev);
if (err) {
dev_err(&pdev->dev, "cannot register net device\n");
--
1.6.5.2
next reply other threads:[~2012-04-03 15:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-03 15:10 Chris Metcalf [this message]
2012-04-03 15:47 ` [PATCH] marvell sky2 driver: fix irq number assignment bug Ben Hutchings
2012-04-03 21:41 ` David Miller
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=201204031526.q33FQvFO031746@farm-0027.internal.tilera.com \
--to=cmetcalf@tilera.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/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;
as well as URLs for NNTP newsgroup(s).