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

Commit a5a356ce authored by Li Jun's avatar Li Jun Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: otg: remove mutex unlock and lock while stop and start role 



Wrongly release mutex lock during otg_statemachine may result in re-enter
otg_statemachine, which is not allowed, we should do next state transtition
after previous one completed.

Fixes: 826cfe75 ("usb: chipidea: add OTG fsm operation functions implementation")
Cc: <stable@vger.kernel.org> # v3.16+
Signed-off-by: default avatarLi Jun <jun.li@freescale.com>
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e779c6c

drivers/usb/chipidea/otg_fsm.c

+0 −4
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ static int ci_otg_start_host(struct otg_fsm *fsm, int on) 
{

	struct ci_hdrc	*ci = container_of(fsm, struct ci_hdrc, fsm);



	mutex_unlock(&fsm->lock);

	if (on) {

		ci_role_stop(ci);

		ci_role_start(ci, CI_ROLE_HOST);
@@ -529,7 +528,6 @@ static int ci_otg_start_host(struct otg_fsm *fsm, int on) 
		hw_device_reset(ci);

		ci_role_start(ci, CI_ROLE_GADGET);

	}

	mutex_lock(&fsm->lock);

	return 0;

}
@@ -537,12 +535,10 @@ static int ci_otg_start_gadget(struct otg_fsm *fsm, int on) 
{

	struct ci_hdrc	*ci = container_of(fsm, struct ci_hdrc, fsm);



	mutex_unlock(&fsm->lock);

	if (on)

		usb_gadget_vbus_connect(&ci->gadget);

	else

		usb_gadget_vbus_disconnect(&ci->gadget);

	mutex_lock(&fsm->lock);



	return 0;

}