Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4e94174 authored by Li Jun's avatar Li Jun Committed by Peter Chen
Browse files

usb: chipidea: udc: don't touch DP when controller is in host mode 



When the controller is configured to be dual role and it's in host mode,
if bind udc and gadgt driver, those gadget operations will do gadget
disconnect and finally pull down DP line, which will break host function.

Cc: <stable@vger.kernel.org> # 4.1+
Signed-off-by: default avatarLi Jun <jun.li@nxp.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent f1f6d9a8

drivers/usb/chipidea/udc.c

+5 −2
Original line number Diff line number Diff line
@@ -1596,8 +1596,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);