diff --git a/[refs] b/[refs] index 0b0ce7bf293b..8f3e5c27ca19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca4f70ce78de9a2fa09741f80cf7bda2f4256ecc +refs/heads/master: 15460de7f3d9cf0846af1cfdb4a3995d2f270ce7 diff --git a/trunk/drivers/usb/phy/phy-twl4030-usb.c b/trunk/drivers/usb/phy/phy-twl4030-usb.c index 7ff67ce373dc..f4ec53a58103 100644 --- a/trunk/drivers/usb/phy/phy-twl4030-usb.c +++ b/trunk/drivers/usb/phy/phy-twl4030-usb.c @@ -498,12 +498,6 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) * USB_LINK_VBUS state. musb_hdrc won't care until it * starts to handle softconnect right. */ - if (status == OMAP_MUSB_VBUS_OFF || - status == OMAP_MUSB_ID_FLOAT) - twl4030_phy_suspend(twl, 0); - else - twl4030_phy_resume(twl); - omap_musb_mailbox(twl->linkstat); } sysfs_notify(&twl->dev->kobj, NULL, "vbus");