]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
spi/bcm63xx-hspi: fix error return code in bcm63xx_hsspi_probe()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 8 Aug 2017 04:59:44 +0000 (23:59 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 8 Aug 2017 10:36:39 +0000 (11:36 +0100)
platform_get_irq() returns an error code, but the spi-bcm63xx-hsspi
driver ignores it and always returns -ENXIO. This is not correct and,
prevents -EPROBE_DEFER from being propagated properly.

Notice that platform_get_irq() no longer returns 0 on error:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

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-bcm63xx-hsspi.c

index 4da2d4a524ca48075d7220737303274d559f064b..b03fc1850ae98b32dcabd8b574586afa3ef1d525 100644 (file)
@@ -338,8 +338,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(dev, "no irq\n");
-               return -ENXIO;
+               dev_err(dev, "no irq: %d\n", irq);
+               return irq;
        }
 
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);