Merge "dwc3: gadget: Fix dr_mode check with USB device mode APIs"

This commit is contained in:
qctecmdr 2020-01-27 20:21:00 -08:00 • committed by Gerrit - the friendly Code Review server
commit b7906ffb6d

View file

@ -2124,7 +2124,7 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
is_on = !!is_on;
dwc->softconnect = is_on;
if (((dwc->dr_mode == USB_DR_MODE_OTG) && !dwc->vbus_active)
if (((dwc->dr_mode > USB_DR_MODE_HOST) && !dwc->vbus_active)
|| !dwc->gadget_driver) {
/*
* Need to wait for vbus_session(on) from otg driver or to
@ -2264,7 +2264,7 @@ static int dwc3_gadget_vbus_session(struct usb_gadget *_gadget, int is_active)
unsigned long flags;
int ret = 0;
if (dwc->dr_mode != USB_DR_MODE_OTG)
if (dwc->dr_mode <= USB_DR_MODE_HOST)
return -EPERM;
is_active = !!is_active;