aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/pci/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
-rw-r--r--arch/sh/drivers/pci/pci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 63b11fddffec..488331c45033 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -58,7 +58,7 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
58 58
59static DEFINE_MUTEX(pci_scan_mutex); 59static DEFINE_MUTEX(pci_scan_mutex);
60 60
61void __devinit register_pci_controller(struct pci_channel *hose) 61int __devinit register_pci_controller(struct pci_channel *hose)
62{ 62{
63 if (request_resource(&iomem_resource, hose->mem_resource) < 0) 63 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
64 goto out; 64 goto out;
@@ -88,10 +88,11 @@ void __devinit register_pci_controller(struct pci_channel *hose)
88 mutex_unlock(&pci_scan_mutex); 88 mutex_unlock(&pci_scan_mutex);
89 } 89 }
90 90
91 return; 91 return 0;
92 92
93out: 93out:
94 printk(KERN_WARNING "Skipping PCI bus scan due to resource conflict\n"); 94 printk(KERN_WARNING "Skipping PCI bus scan due to resource conflict\n");
95 return -1;
95} 96}
96 97
97static int __init pcibios_init(void) 98static int __init pcibios_init(void)