OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9de0661
)
NetXen: Driver ifconfig fix
author
Amit S. Kale
<amitkale@netxen.com>
Wed, 21 Feb 2007 14:54:06 +0000
(06:54 -0800)
committer
Jeff Garzik
<jeff@garzik.org>
Tue, 27 Feb 2007 09:16:04 +0000
(
04:16
-0500)
Signed-off-by: Amit S. Kale <amitkale@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/netxen/netxen_nic_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/netxen/netxen_nic_main.c
b/drivers/net/netxen/netxen_nic_main.c
index
b2fc2bc
..
1bf3d49
100644
(file)
--- 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;