Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / musb / omap2430.c

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ce6c162920f7bfcb5bef980b2438aeba4661d12b..03fc8640ddaf853fab87a051cef0f87274c93de4 100644 (file)
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -217,12 +217,14 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
 
 int __init musb_platform_init(struct musb *musb)
 {
+       struct otg_transceiver *x = otg_get_transceiver();
        u32 l;
 
 #if defined(CONFIG_ARCH_OMAP2430)
        omap_cfg_reg(AE5_2430_USB0HS_STP);
 #endif
 
+       musb->xceiv = *x;
        musb_platform_resume(musb);
 
        l = omap_readl(OTG_SYSCONFIG);