Commit 77adc085 authored by Fabio Estevam's avatar Fabio Estevam Committed by Brian Norris

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarHuang Shijie <shijie8@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent b26171e3
...@@ -849,9 +849,8 @@ static int fsl_qspi_probe(struct platform_device *pdev) ...@@ -849,9 +849,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
ret = clk_prepare_enable(q->clk); ret = clk_prepare_enable(q->clk);
if (ret) { if (ret) {
clk_disable_unprepare(q->clk_en);
dev_err(dev, "can not enable the qspi clock\n"); dev_err(dev, "can not enable the qspi clock\n");
goto map_failed; goto clk_failed;
} }
/* find the irq */ /* find the irq */
...@@ -965,6 +964,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) ...@@ -965,6 +964,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)
irq_failed: irq_failed:
clk_disable_unprepare(q->clk); clk_disable_unprepare(q->clk);
clk_failed:
clk_disable_unprepare(q->clk_en); clk_disable_unprepare(q->clk_en);
map_failed: map_failed:
dev_err(dev, "Freescale QuadSPI probe failed\n"); dev_err(dev, "Freescale QuadSPI probe failed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment