diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-08 17:52:08 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-08 17:52:08 +0300 |
| commit | 422caa5f7a455920369039d04c6070eb50d6146b (patch) | |
| tree | 8667d9587c412ee25660184f6e943ed10e445bc0 /drivers/usb/musb/musb_core.c | |
| parent | 8a331f4a0863bea758561c921b94b4d28f7c4029 (diff) | |
| parent | b3b7c4795ccab5be71f080774c45bbbcc75c2aaf (diff) | |
| download | linux-422caa5f7a455920369039d04c6070eb50d6146b.tar.xz | |
Merge branch 'ras/urgent' into ras/core
Pick up urgent fixes to apply further development changes.
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 968bf1e8b0fe..eef4ad578b31 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2708,7 +2708,8 @@ static int musb_resume(struct device *dev) if ((devctl & mask) != (musb->context.devctl & mask)) musb->port1_status = 0; - musb_start(musb); + musb_enable_interrupts(musb); + musb_platform_enable(musb); spin_lock_irqsave(&musb->lock, flags); error = musb_run_resume_work(musb); |