Unverified Commit 24f70334 authored Dec 07, 2020 by Lukas Wunner Committed by Mark Brown Dec 07, 2020

spi: mt7621: Disable clock in probe error path

Commit 702b15cb ("spi: mt7621: fix missing clk_disable_unprepare()
on error in mt7621_spi_probe") sought to disable the SYS clock on probe
errors, but only did so for 2 of 3 potentially failing calls: The clock
needs to be disabled on failure of devm_spi_register_controller() as
well.

Moreover, the commit purports to fix a bug in commit cbd66c62 ("spi:
mt7621: Move SPI driver out of staging") but in reality the bug has
existed since the driver was first introduced.

Fixes: 1ab7f2a4 ("staging: mt7621-spi: add mt7621 support")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v4.17+: 702b15cb: spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe
Cc: <stable@vger.kernel.org> # v4.17+
Cc: Qinglang Miao <miaoqinglang@huawei.com>
Link: https://lore.kernel.org/r/36ad42760087952fb7c10aae7d2628547c26a7ec.1607286887.git.lukas@wunner.de

Signed-off-by: Mark Brown <broonie@kernel.org>

parent e297ddf2

drivers/spi/spi-mt7621.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,11 @@ static int mt7621_spi_probe(struct platform_device *pdev)
		return ret;
		}

		return devm_spi_register_controller(&pdev->dev, master);
		ret = devm_spi_register_controller(&pdev->dev, master);
		if (ret)
		clk_disable_unprepare(clk);

		return ret;
		}

		static int mt7621_spi_remove(struct platform_device *pdev)

Admin message