usb: phy: twl6030: add IRQ checks
authorSergey Shtylyov <s.shtylyov@omp.ru>
Mon, 9 Aug 2021 20:53:16 +0000 (23:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 09:43:01 +0000 (11:43 +0200)
[ Upstream commit 0881e22c06e66af0b64773c91c8868ead3d01aa1 ]

The driver neglects to check the result of platform_get_irq()'s calls and
blithely passes the negative error codes to request_threaded_irq() (which
takes *unsigned* IRQ #), causing them both to fail with -EINVAL, overriding
an original error code.  Stop calling request_threaded_irq() with the
invalid IRQ #s.

Fixes: c33fad0c3748 ("usb: otg: Adding twl6030-usb transceiver driver for OMAP4430")
Acked-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/9507f50b-50f1-6dc4-f57c-3ed4e53a1c25@omp.ru
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/phy/phy-twl6030-usb.c

index cf0b67433ac951669413a44068e4cf3610b9584c..ccb36e24095308a93114395ebd18b01d947e2264 100644 (file)
@@ -352,6 +352,11 @@ static int twl6030_usb_probe(struct platform_device *pdev)
        twl->irq2               = platform_get_irq(pdev, 1);
        twl->linkstat           = MUSB_UNKNOWN;
 
+       if (twl->irq1 < 0)
+               return twl->irq1;
+       if (twl->irq2 < 0)
+               return twl->irq2;
+
        twl->comparator.set_vbus        = twl6030_set_vbus;
        twl->comparator.start_srp       = twl6030_start_srp;