diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:38:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:38:55 +0800 |
| commit | 7ddc655ad909372848a3e7995e222c2b9224c2e0 (patch) | |
| tree | a68d86598e6527e24197c0d43169807eb3a7f081 /drivers/usb/chipidea/udc.c | |
| parent | 266fa7380746e8d998691be98b311dc426e4c4ce (diff) | |
| parent | 04cb720142764ebf3786eba1feb8fc4b6ef87fcf (diff) | |
Merge tag 'v4.1.33' into linux-linaro-lsk-v4.1lsk-v4.1-16.09
This is the 4.1.33 stable release
Diffstat (limited to 'drivers/usb/chipidea/udc.c')
| -rw-r--r-- | drivers/usb/chipidea/udc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index 92937c14f818..d93e43cfb6f8 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -1578,8 +1578,11 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on) { struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget); - /* Data+ pullup controlled by OTG state machine in OTG fsm mode */ - if (ci_otg_is_fsm_mode(ci)) + /* + * Data+ pullup controlled by OTG state machine in OTG fsm mode; + * and don't touch Data+ in host mode for dual role config. + */ + if (ci_otg_is_fsm_mode(ci) || ci->role == CI_ROLE_HOST) return 0; pm_runtime_get_sync(&ci->gadget.dev); |