lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 49/89] USB: omap_udc: fix omap_udc_start() on 15xx machines
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 6ca6695f576b8453fe68865e84d25946d63b10ad ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/gadget/udc/omap_udc.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
    index d45dc14ef0a2..9060b3af27ff 100644
    --- a/drivers/usb/gadget/udc/omap_udc.c
    +++ b/drivers/usb/gadget/udc/omap_udc.c
    @@ -2045,7 +2045,7 @@ static inline int machine_without_vbus_sense(void)
    static int omap_udc_start(struct usb_gadget *g,
    struct usb_gadget_driver *driver)
    {
    - int status = -ENODEV;
    + int status;
    struct omap_ep *ep;
    unsigned long flags;

    @@ -2083,6 +2083,7 @@ static int omap_udc_start(struct usb_gadget *g,
    goto done;
    }
    } else {
    + status = 0;
    if (can_pullup(udc))
    pullup_enable(udc);
    else
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-14 13:32    [W:4.093 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site