diff options
Diffstat (limited to 'drivers/usb/gadget/tegra_udc.c')
| -rw-r--r-- | drivers/usb/gadget/tegra_udc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c index 2f40ea5afdf6..3b0a710d6cda 100644 --- a/drivers/usb/gadget/tegra_udc.c +++ b/drivers/usb/gadget/tegra_udc.c @@ -1646,8 +1646,10 @@ static int tegra_pullup(struct usb_gadget *gadget, int is_on) (udc->connect_type == CONNECT_TYPE_SDP)) schedule_delayed_work(&udc->non_std_charger_work, msecs_to_jiffies(NON_STD_CHARGER_DET_TIME_MS)); - } else + } else { + cancel_delayed_work(&udc->non_std_charger_work); udc_writel(udc, (tmp & ~USB_CMD_RUN_STOP), USB_CMD_REG_OFFSET); + } DBG("%s(%d) END\n", __func__, __LINE__); return 0; |