diff options
| author |   Ladislav Michl <ladis@linux-mips.org> | 2017-02-11 14:02:49 +0100 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2017-02-28 09:06:23 -0800 |
| commit | 7807e086a2d1f69cc1a57958cac04fea79fc2112 (patch) | |
| tree | 69f75d7fa71ddd432418d027f96b3ede87565aa2 /drivers/memory | |
| parent | Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes (diff) | |
| download | linux-dev-7807e086a2d1f69cc1a57958cac04fea79fc2112.tar.xz linux-dev-7807e086a2d1f69cc1a57958cac04fea79fc2112.zip | |
ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure
gpmc_probe_onenand_child returns success even on gpmc_onenand_init
failure. Fix that.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 5457c361ad58..bf0fe0137dfe 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1947,9 +1947,7 @@ static int gpmc_probe_onenand_child(struct platform_device *pdev, if (!of_property_read_u32(child, "dma-channel", &val)) gpmc_onenand_data->dma_channel = val; - gpmc_onenand_init(gpmc_onenand_data); - - return 0; + return gpmc_onenand_init(gpmc_onenand_data); } #else static int gpmc_probe_onenand_child(struct platform_device *pdev, |