summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTang Bin <tangbin@cmss.chinamobile.com>2020-05-08 19:43:05 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 11:11:55 +0200
commit3244190d24cc0269497483fd8fb6b73b9d09b0d3 (patch)
tree28b6d245351c143bd3864ab117e68784149341e7
parent8e4c3d89d9e2ab6fcc358afa8cde8bf9fb49141c (diff)
USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe()
[ Upstream commit c856b4b0fdb5044bca4c0acf9a66f3b5cc01a37a ] If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in mv_ehci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here. Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Link: https://lore.kernel.org/r/20200508114305.15740-1-tangbin@cmss.chinamobile.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/usb/host/ehci-mv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 849806a75f1c..273736e1d33f 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -197,9 +197,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
hcd->regs = ehci_mv->op_regs;
hcd->irq = platform_get_irq(pdev, 0);
- if (!hcd->irq) {
- dev_err(&pdev->dev, "Cannot get irq.");
- retval = -ENODEV;
+ if (hcd->irq < 0) {
+ retval = hcd->irq;
goto err_disable_clk;
}