Unverified Commit 61f49171 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: qup: Don't skip cleanup in remove's error path 



Returning early in a platform driver's remove callback is wrong. In this
case the dma resources are not released in the error path. this is never
retried later and so this is a permanent leak. To fix this, only skip
hardware disabling if waking the device fails.

Fixes: 64ff247a ("spi: Add Qualcomm QUP SPI controller support")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230330210341.2459548-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2912d42

drivers/spi/spi-qup.c

+13 −9
Original line number Diff line number Diff line
@@ -1276,18 +1276,22 @@ static int spi_qup_remove(struct platform_device *pdev) 
	struct spi_qup *controller = spi_master_get_devdata(master);

	int ret;



	ret = pm_runtime_resume_and_get(&pdev->dev);

	if (ret < 0)

		return ret;

	ret = pm_runtime_get_sync(&pdev->dev);



	if (ret >= 0) {

		ret = spi_qup_set_state(controller, QUP_STATE_RESET);

		if (ret)

		return ret;



	spi_qup_release_dma(master);

			dev_warn(&pdev->dev, "failed to reset controller (%pe)\n",

				 ERR_PTR(ret));



		clk_disable_unprepare(controller->cclk);

		clk_disable_unprepare(controller->iclk);

	} else {

		dev_warn(&pdev->dev, "failed to resume, skip hw disable (%pe)\n",

			 ERR_PTR(ret));

	}



	spi_qup_release_dma(master);



	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);