| From 166c9ca0113486f87df71fdad8d0799987877c1b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 9 Aug 2021 23:53:16 +0300 |
| Subject: usb: phy: twl6030: add IRQ checks |
| |
| From: Sergey Shtylyov <s.shtylyov@omp.ru> |
| |
| [ 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 | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c |
| index 8ba6c5a91557..ab3c38a7d8ac 100644 |
| --- a/drivers/usb/phy/phy-twl6030-usb.c |
| +++ b/drivers/usb/phy/phy-twl6030-usb.c |
| @@ -348,6 +348,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; |
| |
| -- |
| 2.30.2 |
| |