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

Commit e4ca6840 authored by Fabio Estevam's avatar Fabio Estevam Committed by Brian Norris
Browse files

mtd: fsl-quadspi: Fix the error paths 



Jumping to 'map_failed' label is not correct at these points, as it misses to
disable the clocks that were previously enabled.

Jump to 'irq_failed' label instead that will correctly disable the clocks.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarHan Xu <han.xu@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 0760e818

drivers/mtd/spi-nor/fsl-quadspi.c

+4 −4
Original line number Diff line number Diff line
@@ -890,24 +890,24 @@ static int fsl_qspi_probe(struct platform_device *pdev) 


		ret = of_modalias_node(np, modalias, sizeof(modalias));

		if (ret < 0)

			goto map_failed;

			goto irq_failed;



		ret = of_property_read_u32(np, "spi-max-frequency",

				&q->clk_rate);

		if (ret < 0)

			goto map_failed;

			goto irq_failed;



		/* set the chip address for READID */

		fsl_qspi_set_base_addr(q, nor);



		ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD);

		if (ret)

			goto map_failed;

			goto irq_failed;



		ppdata.of_node = np;

		ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);

		if (ret)

			goto map_failed;

			goto irq_failed;



		/* Set the correct NOR size now. */

		if (q->nor_size == 0) {