From: Colin Ian King <colin.k...@canonical.com>

[ Upstream commit a7f40c233a6b0540d28743267560df9cfb571ca9 ]

The comparison of hcd->irq to less than zero for an error check will
never be true because hcd->irq is an unsigned int.  Fix this by
assigning the int retval to the return of platform_get_irq and checking
this for the -ve error condition and assigning hcd->irq to retval.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: c856b4b0fdb5 ("USB: EHCI: ehci-mv: fix error handling in 
mv_ehci_probe()")
Signed-off-by: Colin Ian King <colin.k...@canonical.com>
Link: https://lore.kernel.org/r/20200515165453.104028-1-colin.k...@canonical.com
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/usb/host/ehci-mv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 273736e1d33fa..b29610899c9f6 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -196,11 +196,10 @@ static int mv_ehci_probe(struct platform_device *pdev)
        hcd->rsrc_len = resource_size(r);
        hcd->regs = ehci_mv->op_regs;
 
-       hcd->irq = platform_get_irq(pdev, 0);
-       if (hcd->irq < 0) {
-               retval = hcd->irq;
+       retval = platform_get_irq(pdev, 0);
+       if (retval < 0)
                goto err_disable_clk;
-       }
+       hcd->irq = retval;
 
        ehci = hcd_to_ehci(hcd);
        ehci->caps = (struct ehci_caps *) ehci_mv->cap_regs;
-- 
2.25.1



Reply via email to