summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2022-01-26 11:04:47 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-08 18:24:30 +0100
commit8cfa026a212eaf2ac1f68cc045680debd275e3de (patch)
treed5927c8cd6c29ed8c365f5425591c032f89e526e
parentfe58eb96bb411e4ab2a4aa018ceae47576b35bac (diff)
downloadlinux-8cfa026a212eaf2ac1f68cc045680debd275e3de.tar.gz
linux-8cfa026a212eaf2ac1f68cc045680debd275e3de.tar.bz2
linux-8cfa026a212eaf2ac1f68cc045680debd275e3de.zip
spi: meson-spicc: add IRQ check in meson_spicc_probe
commit e937440f7fc444a3e3f1fb75ea65292d6f433a44 upstream. This check misses checking for platform_get_irq()'s call and may passes the negative error codes to devm_request_irq(), which takes unsigned IRQ #, causing it to fail with -EINVAL, overriding an original error code. Stop calling devm_request_irq() with invalid IRQ #s. Fixes: 454fa271bc4e ("spi: Add Meson SPICC driver") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Link: https://lore.kernel.org/r/20220126110447.24549-1-linmq006@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/spi/spi-meson-spicc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c
index 3c841ae0a3e9..c9c4c0f2e8b7 100644
--- a/drivers/spi/spi-meson-spicc.c
+++ b/drivers/spi/spi-meson-spicc.c
@@ -527,6 +527,11 @@ static int meson_spicc_probe(struct platform_device *pdev)
writel_relaxed(0, spicc->base + SPICC_INTREG);
irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ ret = irq;
+ goto out_master;
+ }
+
ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq,
0, NULL, spicc);
if (ret) {