diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 5 | ||||
| -rw-r--r-- | drivers/usb/otg/tegra-otg.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 543c4fc7f5d1..70505f5e672b 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -3133,12 +3133,13 @@ static int fsl_udc_suspend(struct platform_device *pdev, pm_message_t state) static int fsl_udc_resume(struct platform_device *pdev) { if (udc_controller->transceiver) { + /* enable clock */ + fsl_udc_clk_resume(); if (!(fsl_readl(&usb_sys_regs->vbus_wakeup) & USB_SYS_ID_PIN_STATUS)) { /* If ID status is low means host is connected, return */ return 0; } - /* enable clock and check for VBUS */ - fsl_udc_clk_resume(); + /* check for VBUS */ if (!(fsl_readl(&usb_sys_regs->vbus_wakeup) & USB_SYS_VBUS_STATUS)) { /* if there is no VBUS then power down the clocks and return */ fsl_udc_clk_suspend(); diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index 386bb8b922da..a4c2b621f9ed 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -341,6 +341,7 @@ static int tegra_otg_probe(struct platform_device *pdev) } INIT_WORK (&tegra->work, irq_work); + clk_disable(tegra->clk); dev_info(&pdev->dev, "otg transceiver registered\n"); clk_disable(tegra->clk); return 0; |