Unverified Commit 1991a458 authored by Gabor Juhos's avatar Gabor Juhos Committed by Mark Brown
Browse files

spi: spi-qpic-snand: unregister ECC engine on probe error and device remove 



The on-host hardware ECC engine remains registered both when
the spi_register_controller() function returns with an error
and also on device removal.

Change the qcom_spi_probe() function to unregister the engine
on the error path, and add the missing unregistering call to
qcom_spi_remove() to avoid possible use-after-free issues.

Fixes: 7304d190 ("spi: spi-qpic: add driver for QCOM SPI NAND flash Interface")
Signed-off-by: default avatarGabor Juhos <j4g8y7@gmail.com>
Message-ID: <20250903-qpic-snand-unregister-ecceng-v1-1-ef5387b0abdc@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4de51e81

drivers/spi/spi-qpic-snand.c

+4 −2
Original line number Diff line number Diff line
@@ -1615,11 +1615,13 @@ static int qcom_spi_probe(struct platform_device *pdev) 
	ret = spi_register_controller(ctlr);

	if (ret) {

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

		goto err_spi_init;

		goto err_register_controller;

	}



	return 0;



err_register_controller:

	nand_ecc_unregister_on_host_hw_engine(&snandc->qspi->ecc_eng);

err_spi_init:

	qcom_nandc_unalloc(snandc);

err_snand_alloc:
@@ -1641,7 +1643,7 @@ static void qcom_spi_remove(struct platform_device *pdev) 
	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	spi_unregister_controller(ctlr);



	nand_ecc_unregister_on_host_hw_engine(&snandc->qspi->ecc_eng);

	qcom_nandc_unalloc(snandc);



	clk_disable_unprepare(snandc->aon_clk);