From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 18 Mar 2010 19:19:03 +0000 (+0000)
Subject: ar71xx: add error handling to ar724x_pcibios_init
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7d6e4dd2a5e396ffd868e7e9ae408de0aee2d477

ar71xx: add error handling to ar724x_pcibios_init


SVN-Revision: 20283
---

diff --git a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
index 9d37561aa0..251bf6d390 100644
--- a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
+++ b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
@@ -356,22 +356,33 @@ static void __init ar724x_pci_irq_init(void)
 
 int __init ar724x_pcibios_init(void)
 {
-	int ret;
+	int ret = -ENOMEM;
 
 	ar724x_pci_localcfg_base = ioremap_nocache(AR724X_PCI_CRP_BASE,
 						   AR724X_PCI_CRP_SIZE);
+	if (ar724x_pci_localcfg_base == NULL)
+		goto err;
 
 	ar724x_pci_devcfg_base = ioremap_nocache(AR724X_PCI_CFG_BASE,
 						 AR724X_PCI_CFG_SIZE);
+	if (ar724x_pci_devcfg_base == NULL)
+		goto err_unmap_localcfg;
 
 	ar724x_pci_reset();
 	ret = ar724x_pci_setup();
 	if (ret)
-		return ret;
+		goto err_unmap_devcfg;
 
 	ar724x_pci_fixup_enable = 1;
 	ar724x_pci_irq_init();
 	register_pci_controller(&ar724x_pci_controller);
 
 	return 0;
+
+ err_unmap_devcfg:
+	iounmap(ar724x_pci_devcfg_base);
+ err_unmap_localcfg:
+	iounmap(ar724x_pci_localcfg_base);
+ err:
+	return ret;
 }