summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe JAILLET2025-12-13 08:48:51 +0100
committerGreg Kroah-Hartman2026-01-02 12:56:51 +0100
commit5e4481ef397ea22b9d4fedb2fdef7865ece9fabe (patch)
treea5de6771d21f4828ed2d0659d877e7ebbd0f837d
parentc062e2785bbea7aebc1f8dbe82d9b63afdb7872a (diff)
spi: mpfs: Fix an error handling path in mpfs_spi_probe()
[ Upstream commit a8a313612af7a55083ba5720f14f1835319debee ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/spi/spi-mpfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-mpfs.c b/drivers/spi/spi-mpfs.c
index 9a14d1732a15..7e9e64d8e6c8 100644
--- a/drivers/spi/spi-mpfs.c
+++ b/drivers/spi/spi-mpfs.c
@@ -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");