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

Commit c4b70e0d authored by Lukas Wunner's avatar Lukas Wunner Committed by Greg Kroah-Hartman
Browse files

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



commit 46b5c4fb87ce8211e0f9b0383dbde72c3652d2ba upstream.

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: default avatarLukas Wunner <lukas@wunner.de>
Reviewed-by: default avatarStefan Roese <sr@denx.de>
Cc: <stable@vger.kernel.org> # v4.17+: 5e844cc37a5c: 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: default avatarMark Brown <broonie@kernel.org>
[lukas: backport to v4.19.192]
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bea17822

drivers/staging/mt7621-spi/spi-mt7621.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,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 == NULL) {

		dev_info(&pdev->dev, "master allocation failed\n");

		clk_disable_unprepare(clk);
@@ -502,8 +502,8 @@ static int mt7621_spi_remove(struct platform_device *pdev) 
	master = dev_get_drvdata(&pdev->dev);

	rs = spi_master_get_devdata(master);



	clk_disable(rs->clk);

	spi_unregister_master(master);

	clk_disable_unprepare(rs->clk);



	return 0;

}