hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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@freescale.com>
Acked-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Fabio Estevam 2014-10-17 17:14:01 -03:00 committed by Brian Norris
parent b26171e392
commit 77adc085ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/spi-nor/fsl-quadspi.c
View File

@ -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 @@ last_init_failed:
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");