diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-19 11:55:54 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:19 +0200 |
| commit | 1a89bd0dbcc8af5990b2ad309633062e20de4d5e (patch) | |
| tree | df07badfdb409384e7323e6a5df5fb1cbe4202bd | |
| parent | bdc10765dc58316db60d2e1d8f2ff48ceaf9396c (diff) | |
musb: Fix ST-E changes after 3.4 porting
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | drivers/usb/musb/ux500.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 89ef846d32c..2f089ddcd46 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -346,7 +346,7 @@ static void ux500_musb_set_vbus(struct musb *musb, int is_on) } else { musb->is_active = 1; - musb->xceiv->default_a = 1; + musb->xceiv->otg->default_a = 1; musb->xceiv->state = OTG_STATE_A_WAIT_VRISE; devctl |= MUSB_DEVCTL_SESSION; MUSB_HST_MODE(musb); @@ -357,7 +357,7 @@ static void ux500_musb_set_vbus(struct musb *musb, int is_on) /* NOTE: we're skipping A_WAIT_VFALL -> A_IDLE and * jumping right to B_IDLE... */ - musb->xceiv->default_a = 0; + musb->xceiv->otg->default_a = 0; devctl &= ~MUSB_DEVCTL_SESSION; MUSB_DEV_MODE(musb); } @@ -441,7 +441,7 @@ static int ux500_musb_init(struct musb *musb) } pm_runtime_get_noresume(musb->controller); musb->nb.notifier_call = musb_otg_notifications; - status = otg_register_notifier(musb->xceiv, &musb->nb); + status = usb_register_notifier(musb->xceiv, &musb->nb); if (status < 0) { dev_dbg(musb->controller, "notification register failed\n"); |