netxen: fix merge 9b963e5d0e01461099a
authorAmit Kumar Salecha <amit.salecha@qlogic.com>
Mon, 30 Nov 2009 05:54:55 +0000 (21:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Nov 2009 05:54:55 +0000 (21:54 -0800)
Patch "fix memory initialization:5d521fd36de4e61" didn't got merge.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/netxen/netxen_nic_init.c

index 6ee27a630d892b04e93f62fe05f027707ca9ddcb..80a66746051485016180ccfcd49a56002297f8cd 100644 (file)
@@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
                                continue;
                        if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
                                continue;
+                       if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
+                               continue;
                        if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
                                !NX_IS_REVISION_P3P(adapter->ahw.revision_id))
                                buf[i].data = 0x1020;