diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-02-24 12:44:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 12:44:23 +0100 |
| commit | 028e1415a78733fcd2cba4b4c001826cc37a373e (patch) | |
| tree | ed708093d3572bde15432c53d1c6a3d1102740af /drivers/net | |
| parent | netxen: fix physical port mapping (diff) | |
| download | linux-028e1415a78733fcd2cba4b4c001826cc37a373e.tar.xz linux-028e1415a78733fcd2cba4b4c001826cc37a373e.zip | |
netxen: handle pci bar 0 mapping failure
PCI bar 0 is used for memory mapped register access.
If ioremap fails (returns NULL), register access results
in crash.
Use pci_ioremap_bar() instead of ioremap(), the latter
fails on on 32 bit powerpc where pci resource address is
> 32 bits.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index f42581157f4e..13087782ac40 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/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; |