Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7807e086 authored by Ladislav Michl's avatar Ladislav Michl Committed by Tony Lindgren
Browse files

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: default avatarLadislav Michl <ladis@linux-mips.org>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1bd49882

arch/arm/mach-omap2/gpmc-onenand.c

+6 −4
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int gpmc_onenand_setup(void __iomem *onenand_base, int *freq_ptr) 
	return 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_onenand_platform_data *_onenand_data) 
	if (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
Original line number Diff line number Diff line
@@ -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,

include/linux/omap-gpmc.h

+3 −2
Original line number Diff line number Diff line
@@ -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