Patch "ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure" has been added to the 4.4-stable tree
Subsystems (7)
This is a note to let you know that I've just added the patch titled
ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-omap2-gpmc-onenand-propagate-error-on-initialization-failure.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Dec 12 13:38:50 CET 2017
From: Ladislav Michl <[email protected]>
Date: Sat, 11 Feb 2017 14:02:49 +0100
Subject: ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure
From: Ladislav Michl <[email protected]>
[ Upstream commit 7807e086a2d1f69cc1a57958cac04fea79fc2112 ]
gpmc_probe_onenand_child returns success even on gpmc_onenand_init failure. Fix that.
--- arch/arm/mach-omap2/gpmc-onenand.c | 10 ++++++---- drivers/memory/omap-gpmc.c | 4 +--- include/linux/omap-gpmc.h | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/gpmc-onenand.c +6 -4
@@ -367,7 +367,7 @@ static int gpmc_onenand_setup(void __iomreturn ret; } -void gpmc_onenand_init (struct omap_onenand_platform_data *_onenand_data) +int gpmc_onenand_init (struct omap_onenand_platform_data *_onenand_data) {int err;struct device *dev = &gpmc_onenand_device.dev;
@@ -393,15 +393,17 @@ void gpmc_onenand_init(struct omap_onenaif (err <0 ) {dev_err (dev,"Cannot request GPMC CS %d, error %d\n" , gpmc_onenand_data->cs, err); -return ; +return err; } gpmc_onenand_resource.end = gpmc_onenand_resource.start +ONENAND_IO_SIZE -1 ; -if (platform_device_register (&gpmc_onenand_device) <0 ) { + err =platform_device_register (&gpmc_onenand_device); +if (err) {dev_err (dev,"Unable to register OneNAND device\n" );gpmc_cs_free (gpmc_onenand_data->cs); -return ; } + +return err; }
drivers/memory/omap-gpmc.c +1 -3
@@ -1890,9 +1890,7 @@ static int gpmc_probe_onenand_child(struif (!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,
include/linux/omap-gpmc.h +3 -2
@@ -191,10 +191,11 @@ static inline int gpmc_nand_init(struct#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
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/arm-omap2-gpmc-onenand-propagate-error-on-initialization-failure.patch