aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index d8c4b70e35ba..27d20cbae0aa 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -514,6 +514,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
514 continue; 514 continue;
515 515
516 if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { 516 if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
517 if (off == (NETXEN_CRB_I2C0 + 0x1c))
518 continue;
517 /* do not reset PCI */ 519 /* do not reset PCI */
518 if (off == (ROMUSB_GLB + 0xbc)) 520 if (off == (ROMUSB_GLB + 0xbc))
519 continue; 521 continue;
@@ -537,12 +539,6 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
537 continue; 539 continue;
538 } 540 }
539 541
540 if (off == NETXEN_ADDR_ERROR) {
541 printk(KERN_ERR "%s: Err: Unknown addr: 0x%08x\n",
542 netxen_nic_driver_name, buf[i].addr);
543 continue;
544 }
545
546 init_delay = 1; 542 init_delay = 1;
547 /* After writing this register, HW needs time for CRB */ 543 /* After writing this register, HW needs time for CRB */
548 /* to quiet down (else crb_window returns 0xffffffff) */ 544 /* to quiet down (else crb_window returns 0xffffffff) */