UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe() 

Fix the missing clk_disable_unprepare() before return
from bcm_qspi_probe() in the error handling case.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20211018073413.2029081-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2021-10-18 15:34:13 +08:00 committed by Mark Brown
parent 3340ec49ba
commit ca9b8f56ec
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/spi/spi-bcm-qspi.c
View File

@ -1602,7 +1602,7 @@ int bcm_qspi_probe(struct platform_device *pdev,
&qspi->dev_ids[val]); &qspi->dev_ids[val]);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "IRQ %s not found\n", name); dev_err(&pdev->dev, "IRQ %s not found\n", name);
goto qspi_probe_err; goto qspi_unprepare_err;
} }
qspi->dev_ids[val].dev = qspi; qspi->dev_ids[val].dev = qspi;
@ -1617,7 +1617,7 @@ int bcm_qspi_probe(struct platform_device *pdev,
if (!num_ints) { if (!num_ints) {
dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n"); dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n");
ret = -EINVAL; ret = -EINVAL;
goto qspi_probe_err; goto qspi_unprepare_err;
} }
bcm_qspi_hw_init(qspi); bcm_qspi_hw_init(qspi);
@ -1641,6 +1641,7 @@ int bcm_qspi_probe(struct platform_device *pdev,
qspi_reg_err: qspi_reg_err:
bcm_qspi_hw_uninit(qspi); bcm_qspi_hw_uninit(qspi);
qspi_unprepare_err:
clk_disable_unprepare(qspi->clk); clk_disable_unprepare(qspi->clk);
qspi_probe_err: qspi_probe_err:
kfree(qspi->dev_ids); kfree(qspi->dev_ids);