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

Commit 22008c5b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Reset string ids upon unbind"

parents 37faea19 7179323b

drivers/usb/gadget/function/f_cdev.c

+3 −0
Original line number Diff line number Diff line
@@ -866,6 +866,9 @@ static void usb_cser_unbind(struct usb_configuration *c, struct usb_function *f) 
{

	struct f_cdev *port = func_to_port(f);



	/* Reset string id */

	cser_string_defs[0].id = 0;



	usb_free_all_descriptors(f);

	usb_cser_free_req(port->port_usb.notify, port->port_usb.notify_req);

}

drivers/usb/gadget/function/f_gsi.c

+7 −0
Original line number Diff line number Diff line
@@ -3085,6 +3085,13 @@ static void gsi_unbind(struct usb_configuration *c, struct usb_function *f) 


	ipa_usb_deinit_teth_prot(gsi->prot_id);



	/* Reset string ids */

	rndis_gsi_string_defs[0].id = 0;

	ecm_gsi_string_defs[0].id   = 0;

	rmnet_gsi_string_defs[0].id = 0;

	mbim_gsi_string_defs[0].id  = 0;

	qdss_gsi_string_defs[0].id  = 0;



	if (gsi->prot_id == IPA_USB_RNDIS) {

		gsi->d_port.sm_state = STATE_UNINITIALIZED;

		rndis_deregister(gsi->params);

drivers/usb/gadget/function/f_qdss.c

+4 −0
Original line number Diff line number Diff line
@@ -511,6 +511,10 @@ static void qdss_unbind(struct usb_configuration *c, struct usb_function *f) 


	flush_workqueue(qdss->wq);



	/* Reset string ids */

	qdss_string_defs[QDSS_DATA_IDX].id = 0;

	qdss_string_defs[QDSS_CTRL_IDX].id = 0;



	qdss->debug_inface_enabled = 0;



	clear_eps(f);