]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: mpfs: Fix an error handling path in mpfs_spi_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 13 Dec 2025 07:48:51 +0000 (08:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 14 Dec 2025 10:32:48 +0000 (19:32 +0900)
mpfs_spi_init() calls mpfs_spi_enable_ints(), so mpfs_spi_disable_ints()
should be called if an error occurs after calling mpfs_spi_init(), as
already done in the remove function.

Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://patch.msgid.link/eb35f168517cc402ef7e78f26da02863e2f45c03.1765612110.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mpfs.c

index 9a14d1732a1598dccd977067420ab1a42b53289a..7e9e64d8e6c81342a2d271f6db8ea522c54f0257 100644 (file)
@@ -577,6 +577,7 @@ static int mpfs_spi_probe(struct platform_device *pdev)
 
        ret = devm_spi_register_controller(&pdev->dev, host);
        if (ret) {
+               mpfs_spi_disable_ints(spi);
                mpfs_spi_disable(spi);
                return dev_err_probe(&pdev->dev, ret,
                                     "unable to register host for SPI controller\n");