diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 8 |
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 91c2bc61c8e..e40b914d6fa 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -531,6 +531,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) | |||
| 531 | continue; | 531 | continue; |
| 532 | 532 | ||
| 533 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { | 533 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { |
| 534 | if (off == (NETXEN_CRB_I2C0 + 0x1c)) | ||
| 535 | continue; | ||
| 534 | /* do not reset PCI */ | 536 | /* do not reset PCI */ |
| 535 | if (off == (ROMUSB_GLB + 0xbc)) | 537 | if (off == (ROMUSB_GLB + 0xbc)) |
| 536 | continue; | 538 | continue; |
| @@ -553,12 +555,6 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) | |||
| 553 | continue; | 555 | continue; |
| 554 | } | 556 | } |
| 555 | 557 | ||
| 556 | if (off == NETXEN_ADDR_ERROR) { | ||
| 557 | printk(KERN_ERR "%s: Err: Unknown addr: 0x%08x\n", | ||
| 558 | netxen_nic_driver_name, buf[i].addr); | ||
| 559 | continue; | ||
| 560 | } | ||
| 561 | |||
| 562 | init_delay = 1; | 558 | init_delay = 1; |
| 563 | /* After writing this register, HW needs time for CRB */ | 559 | /* After writing this register, HW needs time for CRB */ |
| 564 | /* to quiet down (else crb_window returns 0xffffffff) */ | 560 | /* to quiet down (else crb_window returns 0xffffffff) */ |
