aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/am335x-evm.dts1
-rw-r--r--drivers/usb/musb/musb_dsps.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 648a67e74d1b..e8ec8756e498 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -192,6 +192,7 @@
192 192
193 usb@47401800 { 193 usb@47401800 {
194 status = "okay"; 194 status = "okay";
195 dr_mode = "host";
195 }; 196 };
196 197
197 dma-controller@07402000 { 198 dma-controller@07402000 {
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 392406da3751..4047cbb91bac 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -231,6 +231,8 @@ static void dsps_musb_try_idle(struct musb *musb, unsigned long timeout)
231 glue->last_timer = jiffies; 231 glue->last_timer = jiffies;
232 return; 232 return;
233 } 233 }
234 if (musb->port_mode == MUSB_PORT_MODE_HOST)
235 return;
234 236
235 if (time_after(glue->last_timer, timeout) && 237 if (time_after(glue->last_timer, timeout) &&
236 timer_pending(&glue->timer)) { 238 timer_pending(&glue->timer)) {