Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03979b57 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit ca9b8f56ec089d3a436050afefd17b7237301f47 ]

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

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20211018073413.2029081-1-yangyingliang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 89d7c841

drivers/spi/spi-bcm-qspi.c

+3 −2
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 
					       &qspi->dev_ids[val]);

			if (ret < 0) {

				dev_err(&pdev->dev, "IRQ %s not found\n", name);

				goto qspi_probe_err;

				goto qspi_unprepare_err;

			}



			qspi->dev_ids[val].dev = qspi;
@@ -1320,7 +1320,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 
	if (!num_ints) {

		dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n");

		ret = -EINVAL;

		goto qspi_probe_err;

		goto qspi_unprepare_err;

	}



	/*
@@ -1371,6 +1371,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 


qspi_reg_err:

	bcm_qspi_hw_uninit(qspi);

qspi_unprepare_err:

	clk_disable_unprepare(qspi->clk);

qspi_probe_err:

	kfree(qspi->dev_ids);