aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2017-08-08 00:14:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-10 14:36:50 -0400
commit46edf52d08342b3dc1f9a61c5200ab8b1c0f5a37 (patch)
treea7c0e772505bc036c5b497bf987adc1f5f02aac4
parent99dbff202e28ad1dadf55b058bcae7908678e963 (diff)
usb: imx21-hcd: fix error return code in imx21_probe()
platform_get_irq() returns an error code, but the imx21-hcd 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 error message 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>
-rw-r--r--drivers/usb/host/imx21-hcd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index f542045dc2a6..e25d72e0527f 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1849,8 +1849,10 @@ static int imx21_probe(struct platform_device *pdev)
1849 if (!res) 1849 if (!res)
1850 return -ENODEV; 1850 return -ENODEV;
1851 irq = platform_get_irq(pdev, 0); 1851 irq = platform_get_irq(pdev, 0);
1852 if (irq < 0) 1852 if (irq < 0) {
1853 return -ENXIO; 1853 dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
1854 return irq;
1855 }
1854 1856
1855 hcd = usb_create_hcd(&imx21_hc_driver, 1857 hcd = usb_create_hcd(&imx21_hc_driver,
1856 &pdev->dev, dev_name(&pdev->dev)); 1858 &pdev->dev, dev_name(&pdev->dev));