From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dhananjay Phadke Subject: [PATCH 1/2] netxen: avoid invalid iounmap Date: Fri, 16 Jan 2009 10:28:03 -0800 Message-ID: <1232130484-25188-2-git-send-email-dhananjay@netxen.com> References: <1232130484-25188-1-git-send-email-dhananjay@netxen.com> Cc: davem@davemloft.net, akpm@linux-foundation.org, linux-kernel@vger.kernel.org To: netdev@vger.kernel.org Return-path: Received: from nxgate.netxen.com ([38.99.60.130]:54448 "EHLO unm84.unmin.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751399AbZAPS2G (ORCPT ); Fri, 16 Jan 2009 13:28:06 -0500 In-Reply-To: <1232130484-25188-1-git-send-email-dhananjay@netxen.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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 8686740..f8e2629 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); -- 1.6.0.2