diff options
| author | Olof Johansson <olof@lixom.net> | 2016-08-26 02:54:16 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-08-26 02:54:16 +0300 |
| commit | 84ba04f26d20d2f91516cd9078e5035f2c8c6087 (patch) | |
| tree | 91c0a6092e3f22137039256676b782192ebdfeb3 | |
| parent | 2586d61f81ea4d84e325cbde2b316c9a8ca43e38 (diff) | |
| parent | 23540d6e2f3193b946c4de43e3f9654fa6d23fe7 (diff) | |
| download | linux-84ba04f26d20d2f91516cd9078e5035f2c8c6087.tar.xz | |
Merge tag 'gpmc-omap-v4.8-rc1' of https://github.com/rogerq/linux into fixes
OMAP-GPMC: fixes for v4.8-rc1
Allow other children of GPMC to probe even if any child fails. This fixes
problem on Overo boards where networking device child doesn't probe due
to broken NAND child.
* tag 'gpmc-omap-v4.8-rc1' of https://github.com/rogerq/linux:
memory: omap-gpmc: allow probe of child nodes to fail
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 869c83fb3c5d..f00f3e742265 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -2185,7 +2185,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) return 0; } -static int gpmc_probe_dt_children(struct platform_device *pdev) +static void gpmc_probe_dt_children(struct platform_device *pdev) { int ret; struct device_node *child; @@ -2200,11 +2200,11 @@ static int gpmc_probe_dt_children(struct platform_device *pdev) else ret = gpmc_probe_generic_child(pdev, child); - if (ret) - return ret; + if (ret) { + dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n", + child->name, ret); + } } - - return 0; } #else static int gpmc_probe_dt(struct platform_device *pdev) @@ -2212,9 +2212,8 @@ static int gpmc_probe_dt(struct platform_device *pdev) return 0; } -static int gpmc_probe_dt_children(struct platform_device *pdev) +static void gpmc_probe_dt_children(struct platform_device *pdev) { - return 0; } #endif /* CONFIG_OF */ @@ -2369,16 +2368,10 @@ static int gpmc_probe(struct platform_device *pdev) goto setup_irq_failed; } - rc = gpmc_probe_dt_children(pdev); - if (rc < 0) { - dev_err(gpmc->dev, "failed to probe DT children\n"); - goto dt_children_failed; - } + gpmc_probe_dt_children(pdev); return 0; -dt_children_failed: - gpmc_free_irq(gpmc); setup_irq_failed: gpmc_gpio_exit(gpmc); gpio_init_failed: |