diff options
| author | Olof Johansson <olof@lixom.net> | 2014-02-01 02:59:28 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-01 02:59:28 +0400 |
| commit | 167eeb470057adb5e9a22281d2852edc91c70473 (patch) | |
| tree | 1cd900f135b5d3c7160f0e18cbd01914d5f7e64d /arch/arm/mach-mvebu | |
| parent | 3f7c73023f7e317b7704d9c1c80a57bd3cc91828 (diff) | |
| parent | 19e61d41404fe4094c2d54943dbf883d9bbca864 (diff) | |
| download | linux-167eeb470057adb5e9a22281d2852edc91c70473.tar.xz | |
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for v3.13 (incremental #2)
- allow building and booting DT and non-DT plat-orion SoCs
- catch proper return value for kirkwood_pm_init()
- properly check return of of_iomap to solve boot hangs (mirabox, others)
- remove a compile warning on Armada 370 with non-SMP.
* tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
ARM: kirkwood: kirkwood_pm_init() should return void
ARM: orion: provide C-style interrupt handler for MULTI_IRQ_HANDLER
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/mvebu-soc-id.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.c b/arch/arm/mach-mvebu/mvebu-soc-id.c index fe4fc1cbdfaf..f3b325f6cbd4 100644 --- a/arch/arm/mach-mvebu/mvebu-soc-id.c +++ b/arch/arm/mach-mvebu/mvebu-soc-id.c @@ -88,7 +88,7 @@ static int __init mvebu_soc_id_init(void) } pci_base = of_iomap(child, 0); - if (IS_ERR(pci_base)) { + if (pci_base == NULL) { pr_err("cannot map registers\n"); ret = -ENOMEM; goto res_ioremap; |