diff mbox

[next,1/2] netxen: fix msi irq setup

Message ID 1242285368-1142-1-git-send-email-dhananjay@netxen.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dhananjay Phadke May 14, 2009, 7:16 a.m. UTC
The pdev->irq was not saved in netxen_adapter, causing request_irq()
with invalid irq number.

This was broken in commit be339aee634d5cb98a8df8d6febe04002ec497f3.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

David Miller May 19, 2009, 4:47 a.m. UTC | #1
From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Thu, 14 May 2009 00:16:08 -0700

> The pdev->irq was not saved in netxen_adapter, causing request_irq()
> with invalid irq number.
> 
> This was broken in commit be339aee634d5cb98a8df8d6febe04002ec497f3.
> 
> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>

Applied, but please reference commits also by header line
text.  See below for the actual commit message I used so
you can see how it should be done, thanks!

netxen: fix msi irq setup

The pdev->irq was not saved in netxen_adapter, causing request_irq()
with invalid irq number.

This was broken in commit be339aee634d5cb98a8df8d6febe04002ec497f3
("netxen: fix irq tear down and msix leak.").

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dhananjay Phadke May 19, 2009, 6:29 p.m. UTC | #2
David Miller wrote:
> Applied, but please reference commits also by header line
> text.  See below for the actual commit message I used so
> you can see how it should be done, thanks!

Thanks for fixing up this time, will get it right next time.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 86ca081..50477f5 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -539,6 +539,7 @@  netxen_setup_intr(struct netxen_adapter *adapter)
 		adapter->msi_tgt_status =
 			msi_tgt_status[adapter->ahw.pci_func];
 		dev_info(&pdev->dev, "using msi interrupts\n");
+		adapter->msix_entries[0].vector = pdev->irq;
 		return;
 	}