summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit S. Kale <amitkale@netxen.com>2007-02-21 06:54:06 -0800
committerJeff Garzik <jeff@garzik.org>2007-02-27 04:16:04 -0500
commitb1adf031a1325bd85eef0313e42d0189d89cece0 (patch)
treebcbd74a9772bc3d7bc186504b4af74b42f55bcc0
parent9de06610669b2f7b9c2ba6f0a849b70aa91b2edb (diff)
downloadop-kernel-dev-b1adf031a1325bd85eef0313e42d0189d89cece0.zip
op-kernel-dev-b1adf031a1325bd85eef0313e42d0189d89cece0.tar.gz
NetXen: Driver ifconfig fix
Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index b2fc2bc..1bf3d49 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -525,6 +525,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
if (adapter == NULL)
return;
+ if (adapter->irq)
+ free_irq(adapter->irq, adapter);
netxen_nic_stop_all_ports(adapter);
/* leave the hw in the same state as reboot */
netxen_pinit_from_rom(adapter, 0);
@@ -672,8 +674,6 @@ static int netxen_nic_close(struct net_device *netdev)
if (!adapter->active_ports) {
netxen_nic_disable_int(adapter);
- if (adapter->irq)
- free_irq(adapter->irq, adapter);
cmd_buff = adapter->cmd_buf_arr;
for (i = 0; i < adapter->max_tx_desc_count; i++) {
buffrag = cmd_buff->frag_array;
OpenPOWER on IntegriCloud