From 545bc81e8b62db67fd6d4d54ccd93adc570a8c14 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 19 Dec 2011 22:17:49 +0200 Subject: [PATCH] --- yaml --- r: 280907 b: refs/heads/master c: b3314d9ac55f4aa13fd339ee16e95828414f51d4 h: refs/heads/master i: 280905: 6c444587bd15944f189bfae279249d48f72a7718 280903: da4b7d8a0852ae0a114dd8a9d093d738433d478c v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/omap2430.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9bc7d6d3f7ab..ebbc579140a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 772aed45b604c5ff171f0f12c12392d868333f79 +refs/heads/master: b3314d9ac55f4aa13fd339ee16e95828414f51d4 diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c index c24dc26b9be2..34c169896836 100644 --- a/trunk/drivers/usb/musb/omap2430.c +++ b/trunk/drivers/usb/musb/omap2430.c @@ -245,13 +245,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work) case USB_EVENT_ID: dev_dbg(musb->controller, "ID GND\n"); - if (is_otg_enabled(musb)) { - if (musb->gadget_driver) { - pm_runtime_get_sync(musb->controller); - otg_init(musb->xceiv); - omap2430_musb_set_vbus(musb, 1); - } - } else { + if (!is_otg_enabled(musb) || musb->gadget_driver) { pm_runtime_get_sync(musb->controller); otg_init(musb->xceiv); omap2430_musb_set_vbus(musb, 1);