diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-01-22 22:43:05 -0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-02-05 19:51:27 -0800 |
| commit | e4ca6840837be86b89e77c8402c1e6ab8a36f274 (patch) | |
| tree | b35866596efd5b6b38bd5697ec9977fda2e58908 /drivers/mtd | |
| parent | 0760e818646d801a13eed57f5fb75c43c7c2794a (diff) | |
| download | linux-e4ca6840837be86b89e77c8402c1e6ab8a36f274.tar.gz linux-e4ca6840837be86b89e77c8402c1e6ab8a36f274.tar.bz2 linux-e4ca6840837be86b89e77c8402c1e6ab8a36f274.zip | |
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: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Han Xu <han.xu@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi-nor/fsl-quadspi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index a46bea33580f..a733bd2eb393 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -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) { |