diff options
| author |   Dhananjay Phadke <dhananjay@netxen.com> | 2009-10-21 19:39:01 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-22 18:27:49 -0700 |
| commit | 8bee0a91dd2f472d51dc107288c988ae0a0f371a (patch) | |
| tree | 00826fd8c12f97c9d4755ddd222a172962ac30df /drivers/net/netxen/netxen_nic_init.c | |
| parent | niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case (diff) | |
| download | linux-dev-8bee0a91dd2f472d51dc107288c988ae0a0f371a.tar.xz linux-dev-8bee0a91dd2f472d51dc107288c988ae0a0f371a.zip | |
netxen: fix i2c init
Avoid resetting subsys ID in i2c block. Also remove duplicate
check for address tranlsation error.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 91c2bc61c8eb..e40b914d6faf 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) continue; if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { + if (off == (NETXEN_CRB_I2C0 + 0x1c)) + continue; /* do not reset PCI */ if (off == (ROMUSB_GLB + 0xbc)) continue; @@ -553,12 +555,6 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) continue; } - if (off == NETXEN_ADDR_ERROR) { - printk(KERN_ERR "%s: Err: Unknown addr: 0x%08x\n", - netxen_nic_driver_name, buf[i].addr); - continue; - } - init_delay = 1; /* After writing this register, HW needs time for CRB */ /* to quiet down (else crb_window returns 0xffffffff) */ |