aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2018-11-24 17:17:06 -0500
committerFelipe Balbi <felipe.balbi@linux.intel.com>2018-11-26 05:37:56 -0500
commit6ca6695f576b8453fe68865e84d25946d63b10ad (patch)
tree3e8346bda9fe38578587d3caa5919251b24c1ff1
parent99f700366fcea1aa2fa3c49c99f371670c3c62f8 (diff)
USB: omap_udc: fix omap_udc_start() on 15xx machines
On OMAP 15xx machines there are no transceivers, and omap_udc_start() always fails as it forgot to adjust the default return value. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
-rw-r--r--drivers/usb/gadget/udc/omap_udc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 240ccba44592..33250e569af8 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2041,7 +2041,7 @@ static inline int machine_without_vbus_sense(void)
2041static int omap_udc_start(struct usb_gadget *g, 2041static int omap_udc_start(struct usb_gadget *g,
2042 struct usb_gadget_driver *driver) 2042 struct usb_gadget_driver *driver)
2043{ 2043{
2044 int status = -ENODEV; 2044 int status;
2045 struct omap_ep *ep; 2045 struct omap_ep *ep;
2046 unsigned long flags; 2046 unsigned long flags;
2047 2047
@@ -2079,6 +2079,7 @@ static int omap_udc_start(struct usb_gadget *g,
2079 goto done; 2079 goto done;
2080 } 2080 }
2081 } else { 2081 } else {
2082 status = 0;
2082 if (can_pullup(udc)) 2083 if (can_pullup(udc))
2083 pullup_enable(udc); 2084 pullup_enable(udc);
2084 else 2085 else