From df439fe792eef7fe46622120674c204d9a3c8aae Mon Sep 17 00:00:00 2001 From: Dhananjay Phadke Date: Tue, 24 Feb 2009 03:44:23 -0800 Subject: [PATCH] --- yaml --- r: 131939 b: refs/heads/master c: 028e1415a78733fcd2cba4b4c001826cc37a373e h: refs/heads/master i: 131937: 5a107429a6f6fd6f02922c40d3a72d13197cf616 131935: 4a550c66f082bd524bfea3d0ab8ad641a7625c1a v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a1a86a0b0b4..dd3b4cafbb08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 044fad0dbb4e814c061916fe5a36851af2fd1135 +refs/heads/master: 028e1415a78733fcd2cba4b4c001826cc37a373e diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index f42581157f4e..13087782ac40 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;