Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e3ec9cd authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int 



[ 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: default avatarColin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20200515165453.104028-1-colin.king@canonical.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3a9677b7

drivers/usb/host/ehci-mv.c

+3 −4
Original line number Diff line number Diff line
@@ -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;