mtd: fsl-quadspi: Let the clocks error path be clearer

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=77adc085aee0c96dc3536403b197707316c7c241
Commit:     77adc085aee0c96dc3536403b197707316c7c241
Parent:     b26171e392c7d3952b6eeb6da62a861c5317e438
Author:     Fabio Estevam <fabio.estevam at freescale.com>
AuthorDate: Fri Oct 17 17:14:01 2014 -0300
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Oct 22 01:35:41 2014 -0700

    mtd: fsl-quadspi: Let the clocks error path be clearer
    
    When clk_prepare_enable(q->clk) fails it is clearer to disable the previous
    acquired clock (q->clk_en) in the error path rather than doing it locally.
    
    So disable q->clk_en in the error path only.
    
    Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
    Acked-by: Huang Shijie <shijie8 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/spi-nor/fsl-quadspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 94e7355..b6aab38 100644
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -849,9 +849,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
 
 	ret = clk_prepare_enable(q->clk);
 	if (ret) {
-		clk_disable_unprepare(q->clk_en);
 		dev_err(dev, "can not enable the qspi clock\n");
-		goto map_failed;
+		goto clk_failed;
 	}
 
 	/* find the irq */
@@ -965,6 +964,7 @@ last_init_failed:
 
 irq_failed:
 	clk_disable_unprepare(q->clk);
+clk_failed:
 	clk_disable_unprepare(q->clk_en);
 map_failed:
 	dev_err(dev, "Freescale QuadSPI probe failed\n");