]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
spi: spi-sh: fix error return code in spi_sh_probe()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 9 Aug 2017 15:46:48 +0000 (10:46 -0500)
committerMark Brown <broonie@kernel.org>
Wed, 9 Aug 2017 16:18:06 +0000 (17:18 +0100)
platform_get_irq() returns an error code, but the spi-sh driver
ignores it and always returns -ENODEV. This is not correct and,
prevents -EPROBE_DEFER from being propagated properly.

Print and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sh.c

index 2bf53f0e27d9e0fe7bb179c2d3a143c012010a55..50e0ea9acf8b8771b568064d16e76c30ddb144bc 100644 (file)
@@ -446,8 +446,8 @@ static int spi_sh_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(&pdev->dev, "platform_get_irq error\n");
-               return -ENODEV;
+               dev_err(&pdev->dev, "platform_get_irq error: %d\n", irq);
+               return irq;
        }
 
        master = spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data));