openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines 

Make sure to undo the prior changes done by the driver when exiting due
to failure to acquire reset lines.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200601070444.16923-5-vigneshr@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vignesh Raghavendra 2020-06-01 12:34:40 +05:30 committed by Mark Brown
parent 48aae57f0f
commit c61088d1f9
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/spi-nor/controllers/cadence-quadspi.c
View File

@ -1359,13 +1359,13 @@ static int cqspi_probe(struct platform_device *pdev)
rstc = devm_reset_control_get_optional_exclusive(dev, "qspi"); rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
if (IS_ERR(rstc)) { if (IS_ERR(rstc)) {
dev_err(dev, "Cannot get QSPI reset.\n"); dev_err(dev, "Cannot get QSPI reset.\n");
return PTR_ERR(rstc); goto probe_reset_failed;
} }
rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp"); rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
if (IS_ERR(rstc_ocp)) { if (IS_ERR(rstc_ocp)) {
dev_err(dev, "Cannot get QSPI OCP reset.\n"); dev_err(dev, "Cannot get QSPI OCP reset.\n");
return PTR_ERR(rstc_ocp); goto probe_reset_failed;
} }
reset_control_assert(rstc); reset_control_assert(rstc);
@ -1384,7 +1384,7 @@ static int cqspi_probe(struct platform_device *pdev)
pdev->name, cqspi); pdev->name, cqspi);
if (ret) { if (ret) {
dev_err(dev, "Cannot request IRQ.\n"); dev_err(dev, "Cannot request IRQ.\n");
goto probe_irq_failed; goto probe_reset_failed;
} }
cqspi_wait_idle(cqspi); cqspi_wait_idle(cqspi);
@ -1401,7 +1401,7 @@ static int cqspi_probe(struct platform_device *pdev)
return ret; return ret;
probe_setup_failed: probe_setup_failed:
cqspi_controller_enable(cqspi, 0); cqspi_controller_enable(cqspi, 0);
probe_irq_failed: probe_reset_failed:
clk_disable_unprepare(cqspi->clk); clk_disable_unprepare(cqspi->clk);
probe_clk_failed: probe_clk_failed:
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);