Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3bfafd6b136bea2de9bd96c01b7e3808635a15b2

Authored by Dhananjay Phadke
Committed by David S. Miller
1 parent a58c891a53
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/net/netxen/netxen_nic_main.c
Diff comments   View file @ 3bfafd6
... ... @@ -1004,8 +1004,10 @@
1004 1004  
1005 1005 iounmap(adapter->ahw.db_base);
1006 1006 iounmap(adapter->ahw.pci_base0);
1007   - iounmap(adapter->ahw.pci_base1);
1008   - iounmap(adapter->ahw.pci_base2);
  1007 + if (adapter->ahw.pci_base1 != NULL)
  1008 + iounmap(adapter->ahw.pci_base1);
  1009 + if (adapter->ahw.pci_base2 != NULL)
  1010 + iounmap(adapter->ahw.pci_base2);
1009 1011  
1010 1012 pci_release_regions(pdev);
1011 1013 pci_disable_device(pdev);