Unverified Commit 46b5c4fb authored Dec 07, 2020 by Lukas Wunner Committed by Mark Brown Dec 07, 2020

spi: mt7621: Don't leak SPI master in probe error path



If the calls to device_reset() or devm_spi_register_controller() fail on
probe of the MediaTek MT7621 SPI driver, the spi_controller struct is
erroneously not freed.  Fix by switching over to the new
devm_spi_alloc_master() helper.

Additionally, there's an ordering issue in mt7621_spi_remove() wherein
the spi_controller is unregistered after disabling the SYS clock.
The correct order is to call spi_unregister_controller() *before* this
teardown step because bus accesses may still be ongoing until that
function returns.

All of these bugs have existed since the driver was first introduced,
so it seems fair to fix them together in a single commit.

Fixes: 1ab7f2a4 ("staging: mt7621-spi: add mt7621 support")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: <stable@vger.kernel.org> # v4.17+: 5e844cc3: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v4.17+
Link: https://lore.kernel.org/r/72b680796149f5fcda0b3f530ffb7ee73b04f224.1607286887.git.lukas@wunner.de


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

parent 24f70334

drivers/spi/spi-mt7621.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ static int mt7621_spi_probe(struct platform_device *pdev)
		if (status)
		return status;

		master = spi_alloc_master(&pdev->dev, sizeof(*rs));
		master = devm_spi_alloc_master(&pdev->dev, sizeof(*rs));
		if (!master) {
		dev_info(&pdev->dev, "master allocation failed\n");
		clk_disable_unprepare(clk);
		@@ -382,7 +382,7 @@ static int mt7621_spi_probe(struct platform_device *pdev)
		return ret;
		}

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

		@@ -397,6 +397,7 @@ static int mt7621_spi_remove(struct platform_device *pdev)
		master = dev_get_drvdata(&pdev->dev);
		rs = spi_controller_get_devdata(master);

		spi_unregister_controller(master);
		clk_disable_unprepare(rs->clk);

		return 0;

Admin message