Unverified Commit cc53711b authored by Lukas Wunner's avatar Lukas Wunner Committed by Mark Brown
Browse files

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



If the calls to devm_clk_get() or devm_ioremap_resource() fail on probe
of the Macronix SPI driver, the spi_master struct is erroneously not freed.

Fix by switching over to the new devm_spi_alloc_master() helper.

Fixes: b942d80b ("spi: Add MXIC controller driver")
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v5.0+: 5e844cc3: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v5.0+
Cc: Mason Yang <masonccyang@mxic.com.tw>
Link: https://lore.kernel.org/r/4fa6857806e7e75741c05d057ac9df3564460114.1607286887.git.lukas@wunner.de


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

drivers/spi/spi-mxic.c

+2 −8
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int mxic_spi_probe(struct platform_device *pdev) 
	struct mxic_spi *mxic;

	int ret;



	master = spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));

	master = devm_spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));

	if (!master)

		return -ENOMEM;
@@ -574,14 +574,8 @@ static int mxic_spi_probe(struct platform_device *pdev) 
	ret = spi_register_master(master);

	if (ret) {

		dev_err(&pdev->dev, "spi_register_master failed\n");

		goto err_put_master;

	}



	return 0;



err_put_master:

	spi_master_put(master);

		pm_runtime_disable(&pdev->dev);

	}



	return ret;

}