diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2011-12-19 22:17:49 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-12-20 13:54:52 +0200 |
| commit | b3314d9ac55f4aa13fd339ee16e95828414f51d4 (patch) | |
| tree | bff0e1abd309de0e2f79bafc8f3adebe53d51ee4 /drivers/usb/musb | |
| parent | 772aed45b604c5ff171f0f12c12392d868333f79 (diff) | |
| download | linux-stable-b3314d9ac55f4aa13fd339ee16e95828414f51d4.tar.gz linux-stable-b3314d9ac55f4aa13fd339ee16e95828414f51d4.tar.bz2 linux-stable-b3314d9ac55f4aa13fd339ee16e95828414f51d4.zip | |
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 c24dc26b9be2..34c169896836 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) 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); |