diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2011-12-19 15:17:49 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-12-20 06:54:52 -0500 |
commit | b3314d9ac55f4aa13fd339ee16e95828414f51d4 (patch) | |
tree | bff0e1abd309de0e2f79bafc8f3adebe53d51ee4 /drivers/usb/musb | |
parent | 772aed45b604c5ff171f0f12c12392d868333f79 (diff) |
usb: musb: trivial cleanup
enabled && driver || !enabled can be simplified to !enabled || driver.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r-- | drivers/usb/musb/omap2430.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index c24dc26b9be..34c16989683 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
@@ -245,13 +245,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work) | |||
245 | case USB_EVENT_ID: | 245 | case USB_EVENT_ID: |
246 | dev_dbg(musb->controller, "ID GND\n"); | 246 | dev_dbg(musb->controller, "ID GND\n"); |
247 | 247 | ||
248 | if (is_otg_enabled(musb)) { | 248 | if (!is_otg_enabled(musb) || musb->gadget_driver) { |
249 | if (musb->gadget_driver) { | ||
250 | pm_runtime_get_sync(musb->controller); | ||
251 | otg_init(musb->xceiv); | ||
252 | omap2430_musb_set_vbus(musb, 1); | ||
253 | } | ||
254 | } else { | ||
255 | pm_runtime_get_sync(musb->controller); | 249 | pm_runtime_get_sync(musb->controller); |
256 | otg_init(musb->xceiv); | 250 | otg_init(musb->xceiv); |
257 | omap2430_musb_set_vbus(musb, 1); | 251 | omap2430_musb_set_vbus(musb, 1); |