diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-01-16 20:03:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-16 20:03:01 +0100 |
| commit | 3bfafd6b136bea2de9bd96c01b7e3808635a15b2 (patch) | |
| tree | 6fd176a779975662742df9f5227263c9bf596e78 | |
| parent | b44: GFP_DMA skb should not escape from driver (diff) | |
| download | linux-3bfafd6b136bea2de9bd96c01b7e3808635a15b2.tar.xz linux-3bfafd6b136bea2de9bd96c01b7e3808635a15b2.zip | |
netxen: avoid invalid iounmap
For NX3031 only one I/O range is mapped, so unmapping other
two which are used by older chips, causes this warning on
ppc64.
"Attempt to iounmap early bolted mapping at 0x0000000000000000"
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 86867405a367..f8e26290a22f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1004,8 +1004,10 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) iounmap(adapter->ahw.db_base); iounmap(adapter->ahw.pci_base0); - iounmap(adapter->ahw.pci_base1); - iounmap(adapter->ahw.pci_base2); + if (adapter->ahw.pci_base1 != NULL) + iounmap(adapter->ahw.pci_base1); + if (adapter->ahw.pci_base2 != NULL) + iounmap(adapter->ahw.pci_base2); pci_release_regions(pdev); pci_disable_device(pdev); |