KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: add error handling to ar724x_pcibios_init

Browse source 
SVN-Revision: 20283
This commit is contained in:
Gabor Juhos 2010-03-18 19:19:03 +00:00
parent 695e989c6f
commit b051a3b784
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
View file

@ -356,22 +356,33 @@ static void __init ar724x_pci_irq_init(void)
int __init ar724x_pcibios_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_localcfg_base = ioremap_nocache(AR724X_PCI_CRP_BASE,
AR724X_PCI_CRP_SIZE); AR724X_PCI_CRP_SIZE);
if (ar724x_pci_localcfg_base == NULL)
goto err;
ar724x_pci_devcfg_base = ioremap_nocache(AR724X_PCI_CFG_BASE, ar724x_pci_devcfg_base = ioremap_nocache(AR724X_PCI_CFG_BASE,
AR724X_PCI_CFG_SIZE); AR724X_PCI_CFG_SIZE);
if (ar724x_pci_devcfg_base == NULL)
goto err_unmap_localcfg;
ar724x_pci_reset(); ar724x_pci_reset();
ret = ar724x_pci_setup(); ret = ar724x_pci_setup();
if (ret) if (ret)
return ret; goto err_unmap_devcfg;
ar724x_pci_fixup_enable = 1; ar724x_pci_fixup_enable = 1;
ar724x_pci_irq_init(); ar724x_pci_irq_init();
register_pci_controller(&ar724x_pci_controller); register_pci_controller(&ar724x_pci_controller);
return 0; return 0;
err_unmap_devcfg:
iounmap(ar724x_pci_devcfg_base);
err_unmap_localcfg:
iounmap(ar724x_pci_localcfg_base);
err:
return ret;
} }