diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-10-16 13:04:24 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-10-16 13:04:24 +0200 |
| commit | f8e718054f4421d11638e370b933ccc6c77466ed (patch) | |
| tree | 973ff8cb8aed7d8e4da6a194456ddc01c206b7de /drivers/usb/phy/phy-twl6030-usb.c | |
| parent | d900385139e5aa8d584dee92c87bb85d0226253e (diff) | |
| parent | 1392fe82d7fba00ba4a8e01968935f2b2085d5a4 (diff) | |
Merge tag 'v4.4.288' into toradex_vf_4.4
This is the 4.4.288 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/usb/phy/phy-twl6030-usb.c')
| -rw-r--r-- | drivers/usb/phy/phy-twl6030-usb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c index 12741856a75c..220e1a59a871 100644 --- a/drivers/usb/phy/phy-twl6030-usb.c +++ b/drivers/usb/phy/phy-twl6030-usb.c @@ -336,6 +336,11 @@ static int twl6030_usb_probe(struct platform_device *pdev) twl->irq2 = platform_get_irq(pdev, 1); twl->linkstat = OMAP_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; |