diff options
| author | Matthias Brugger <mbrugger@iseebcn.com> | 2012-08-16 13:00:25 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-08-20 10:20:04 +0300 |
| commit | 10770c5aa0fe686014e9c15906a3ff702a4b0baf (patch) | |
| tree | 3d304bdca0b5009ea05a101b5d06ba074277a42e /drivers/usb/musb/omap2430.c | |
| parent | 12a19b5f836c1a1b838e668f9aa804d017d8c58b (diff) | |
| download | blackbird-op-linux-10770c5aa0fe686014e9c15906a3ff702a4b0baf.tar.gz blackbird-op-linux-10770c5aa0fe686014e9c15906a3ff702a4b0baf.zip | |
usb: musb: omap2430.c delete unused variable.
Variable ret is always evaluated as true, so we don't need to check it.
Signed-off-by: Matthias Brugger <mbrugger@iseebcn.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index af5f4214673d..02c39a72b27e 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -141,7 +141,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) struct usb_otg *otg = musb->xceiv->otg; u8 devctl; unsigned long timeout = jiffies + msecs_to_jiffies(1000); - int ret = 1; /* HDRC controls CPEN, but beware current surges during device * connect. They can trigger transient overcurrent conditions * that must be ignored. @@ -168,12 +167,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) || loops-- <= 0) { dev_err(musb->controller, "configured as A device timeout"); - ret = -EINVAL; break; } } - if (ret && otg->set_vbus) + if (otg->set_vbus) otg_set_vbus(otg, 1); } else { musb->is_active = 1; |
