summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-12-20 10:47:15 +0100
committerFelipe Balbi <balbi@ti.com>2013-12-20 22:05:44 +0100
commitfa6997d3a58ba9732870a20364bccb501b641ba9 (patch)
treee268dc3c8817aa003d883c56cfc2a86771cda24b /drivers/usb
parentusb: musb: fix prototype for musb_port_reset (diff)
downloadlinux-fa6997d3a58ba9732870a20364bccb501b641ba9.tar.xz
linux-fa6997d3a58ba9732870a20364bccb501b641ba9.zip
usb: musb: fix musb pointer acqusition in musb_host_finish_resume
This is a fall-out from "usb: musb: finish suspend/reset work independently from musb_hub_control()" that I missed because the MUSB_POWER register does not have the MUSB_POWER_SUSPENDM bit set on AM335x platforms; hence the code path was not travelled in my tests. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_virthub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index ad417fd0e1a7..966cf95bb453 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -50,7 +50,7 @@ void musb_host_finish_resume(struct work_struct *work)
unsigned long flags;
u8 power;
- musb = container_of(work, struct musb, deassert_reset_work.work);
+ musb = container_of(work, struct musb, finish_resume_work.work);
spin_lock_irqsave(&musb->lock, flags);