From 7d92d600daf270ffcc60d9303483a5f8ab95ad71 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 24 Feb 2009 03:51:03 -0800 Subject: [PATCH] --- yaml --- r: 134665 b: refs/heads/master c: 5325a7bf92d5bcac39dbefdfcc214379d17f3d3a h: refs/heads/master i: 134663: b507b6db4640d16fb93df1b7fb3c43ea8863925f v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b805e336221c..b1f0a4d02e83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e70049b9e74267dd47e1ffa62302073487afcb48 +refs/heads/master: 5325a7bf92d5bcac39dbefdfcc214379d17f3d3a diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index 74017790f4a9..2648e9026726 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -588,7 +588,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->pci_mem_read = netxen_nic_pci_mem_read_2M; adapter->pci_mem_write = netxen_nic_pci_mem_write_2M; - mem_ptr0 = ioremap(mem_base, mem_len); + mem_ptr0 = pci_ioremap_bar(pdev, 0); + if (mem_ptr0 == NULL) { + dev_err(&pdev->dev, "failed to map PCI bar 0\n"); + return -EIO; + } + pci_len0 = mem_len; first_page_group_start = 0; first_page_group_end = 0; @@ -796,9 +801,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * See if the firmware gave us a virtual-physical port mapping. */ adapter->physical_port = adapter->portnum; - i = adapter->pci_read_normalize(adapter, CRB_V2P(adapter->portnum)); - if (i != 0x55555555) - adapter->physical_port = i; + if (adapter->fw_major < 4) { + i = adapter->pci_read_normalize(adapter, + CRB_V2P(adapter->portnum)); + if (i != 0x55555555) + adapter->physical_port = i; + } adapter->flags &= ~(NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED);