]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
staging: most: hdm-dim2: fix error return code in dim2_probe()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 8 Aug 2017 22:50:49 +0000 (17:50 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Aug 2017 22:57:17 +0000 (15:57 -0700)
platform_get_irq() returns an error code, but the dim2_hdm driver
ignores it and always returns -ENODEV. This is not correct and,
prevents -EPROBE_DEFER from being propagated properly.

Also, 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/most/hdm-dim2/dim2_hdm.c

index b1567c80ecd3b6ad13fdbceac3f045c1dc65f202..df7021c522b344f37ad43833486aa13ff3b16f41 100644 (file)
@@ -761,8 +761,8 @@ static int dim2_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get ahb0_int irq\n");
-               return -ENODEV;
+               dev_err(&pdev->dev, "failed to get ahb0_int irq: %d\n", irq);
+               return irq;
        }
 
        ret = devm_request_irq(&pdev->dev, irq, dim2_ahb_isr, 0,
@@ -774,8 +774,8 @@ static int dim2_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 1);
        if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get mlb_int irq\n");
-               return -ENODEV;
+               dev_err(&pdev->dev, "failed to get mlb_int irq: %d\n", irq);
+               return irq;
        }
 
        ret = devm_request_irq(&pdev->dev, irq, dim2_mlb_isr, 0,