diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-02-01 13:11:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-01 13:11:25 +0900 |
| commit | bcf39352eb9e9026f7a1028d4bce3707b65f104b (patch) | |
| tree | 440794a7fe888c48bfb49bdd994873ae8a136866 /arch/sh/drivers/pci/pci-sh7751.c | |
| parent | sh: Enable PCI66 support for SH7780 host controller. (diff) | |
| download | linux-dev-bcf39352eb9e9026f7a1028d4bce3707b65f104b.tar.xz linux-dev-bcf39352eb9e9026f7a1028d4bce3707b65f104b.zip | |
sh: Handle PCI controller resource conflicts.
register_pci_controller() can fail, but presently is a void function.
Change this over to an int so that we can bail early before continuing on
with post-registration initialization (such as throwing the controller in
to 66MHz mode in the case of the SH7780 host controller).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh7751.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7751.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index 02306ddb4011..6ad5beb524aa 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c @@ -176,8 +176,6 @@ static int __init sh7751_pci_init(void) word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM; pci_write_reg(chan, word, SH4_PCICR); - register_pci_controller(chan); - - return 0; + return register_pci_controller(chan); } arch_initcall(sh7751_pci_init); |