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 /include/linux/omap-gpmc.h | |
| 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 'include/linux/omap-gpmc.h')
| -rw-r--r-- | include/linux/omap-gpmc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index 35d0fd7a4948..e821a3132a3e 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h @@ -88,10 +88,11 @@ static inline int gpmc_nand_init(struct omap_nand_platform_data *d, #endif #if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) -extern void gpmc_onenand_init(struct omap_onenand_platform_data *d); +extern int gpmc_onenand_init(struct omap_onenand_platform_data *d); #else #define board_onenand_data NULL -static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d) +static inline int gpmc_onenand_init(struct omap_onenand_platform_data *d) { + return 0; } #endif |