]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/suse-2.6.27.39/patches.drivers/netxen-avoid-invalid-iounmap.patch
Fix oinkmaster patch.
[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.drivers / netxen-avoid-invalid-iounmap.patch
1 From 3bfafd6b136bea2de9bd96c01b7e3808635a15b2 Mon Sep 17 00:00:00 2001
2 From: Dhananjay Phadke <dhananjay@netxen.com>
3 Date: Fri, 16 Jan 2009 11:03:01 -0800
4 Subject: netxen: avoid invalid iounmap
5 Acked-by: Karsten Keil <kkeil@novell.com>
6 Reference: bnc#472416
7
8 For NX3031 only one I/O range is mapped, so unmapping other
9 two which are used by older chips, causes this warning on
10 ppc64.
11
12 "Attempt to iounmap early bolted mapping at 0x0000000000000000"
13
14 Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
15 Signed-off-by: David S. Miller <davem@davemloft.net>
16 ---
17 drivers/net/netxen/netxen_nic_main.c | 6 ++++--
18 1 files changed, 4 insertions(+), 2 deletions(-)
19
20 Index: linux-2.6.27-kketmp/drivers/net/netxen/netxen_nic_main.c
21 ===================================================================
22 --- linux-2.6.27-kketmp.orig/drivers/net/netxen/netxen_nic_main.c
23 +++ linux-2.6.27-kketmp/drivers/net/netxen/netxen_nic_main.c
24 @@ -993,8 +993,10 @@ static void __devexit netxen_nic_remove(
25
26 iounmap(adapter->ahw.db_base);
27 iounmap(adapter->ahw.pci_base0);
28 - iounmap(adapter->ahw.pci_base1);
29 - iounmap(adapter->ahw.pci_base2);
30 + if (adapter->ahw.pci_base1 != NULL)
31 + iounmap(adapter->ahw.pci_base1);
32 + if (adapter->ahw.pci_base2 != NULL)
33 + iounmap(adapter->ahw.pci_base2);
34
35 pci_release_regions(pdev);
36 pci_disable_device(pdev);