diff options
author | Matthias Brugger <mbrugger@iseebcn.com> | 2012-08-16 07:00:25 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-08-20 03:20:04 -0400 |
commit | 10770c5aa0fe686014e9c15906a3ff702a4b0baf (patch) | |
tree | 3d304bdca0b5009ea05a101b5d06ba074277a42e /drivers/usb/musb/omap2430.c | |
parent | 12a19b5f836c1a1b838e668f9aa804d017d8c58b (diff) |
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) | |||
141 | struct usb_otg *otg = musb->xceiv->otg; | 141 | struct usb_otg *otg = musb->xceiv->otg; |
142 | u8 devctl; | 142 | u8 devctl; |
143 | unsigned long timeout = jiffies + msecs_to_jiffies(1000); | 143 | unsigned long timeout = jiffies + msecs_to_jiffies(1000); |
144 | int ret = 1; | ||
145 | /* HDRC controls CPEN, but beware current surges during device | 144 | /* HDRC controls CPEN, but beware current surges during device |
146 | * connect. They can trigger transient overcurrent conditions | 145 | * connect. They can trigger transient overcurrent conditions |
147 | * that must be ignored. | 146 | * that must be ignored. |
@@ -168,12 +167,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) | |||
168 | || loops-- <= 0) { | 167 | || loops-- <= 0) { |
169 | dev_err(musb->controller, | 168 | dev_err(musb->controller, |
170 | "configured as A device timeout"); | 169 | "configured as A device timeout"); |
171 | ret = -EINVAL; | ||
172 | break; | 170 | break; |
173 | } | 171 | } |
174 | } | 172 | } |
175 | 173 | ||
176 | if (ret && otg->set_vbus) | 174 | if (otg->set_vbus) |
177 | otg_set_vbus(otg, 1); | 175 | otg_set_vbus(otg, 1); |
178 | } else { | 176 | } else { |
179 | musb->is_active = 1; | 177 | musb->is_active = 1; |