]> git.hungrycats.org Git - linux/commitdiff
gpu: host1x: fix error return code in host1x_probe()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 8 Aug 2017 05:08:06 +0000 (00:08 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 10 Nov 2018 15:41:39 +0000 (07:41 -0800)
[ Upstream commit 7b2c63de20080c18d0de35b292ad61fc9bc8328e ]

platform_get_irq() returns an error code, but the host1x 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: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/host1x/dev.c

index 53d3d1d45b48ecdf1758e4ddf58076c840f6fd02..ce1b10a2ae857a6f70dc36129b106bfba5eecd65 100644 (file)
@@ -116,8 +116,8 @@ static int host1x_probe(struct platform_device *pdev)
 
        syncpt_irq = platform_get_irq(pdev, 0);
        if (syncpt_irq < 0) {
-               dev_err(&pdev->dev, "failed to get IRQ\n");
-               return -ENXIO;
+               dev_err(&pdev->dev, "failed to get IRQ: %d\n", syncpt_irq);
+               return syncpt_irq;
        }
 
        host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);