summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConor Dooley <conor.dooley@microchip.com>2022-06-14 07:58:10 +0100
committerMark Brown <broonie@kernel.org>2022-06-14 09:26:41 +0100
commitd38dc01a4e68133e11ae74af7585d2c4bbd5803d (patch)
treec3048a57f8ab05a5c9df0769fd034fdd26670002
parent35f2b9afc23b75e407caa70635851292056bff33 (diff)
downloadlinux-stable-d38dc01a4e68133e11ae74af7585d2c4bbd5803d.tar.gz
linux-stable-d38dc01a4e68133e11ae74af7585d2c4bbd5803d.tar.bz2
linux-stable-d38dc01a4e68133e11ae74af7585d2c4bbd5803d.zip
spi: microchip-core: fix potentially incorrect return from probe
If platform_get_irqi() returns 0, the error case will be triggered but probe() will return 0 rather than an error. Ape the other drivers using this pattern and return -ENXIO. Reported-by: Yang Li <yang.lee@linux.alibaba.com> Link: https://lore.kernel.org/linux-spi/20220609055533.95866-2-yang.lee@linux.alibaba.com/ Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers") Link: https://lore.kernel.org/r/20220614065809.1969177-1-conor.dooley@microchip.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-microchip-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index 5b22a1395554..856a68fd8e9f 100644
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -541,7 +541,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
spi->irq = platform_get_irq(pdev, 0);
if (spi->irq <= 0) {
dev_err(&pdev->dev, "invalid IRQ %d for SPI controller\n", spi->irq);
- ret = spi->irq;
+ ret = -ENXIO;
goto error_release_master;
}