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

Commit b9d505e5 authored by Package Warehouse Build User's avatar Package Warehouse Build User Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: function: Clear function suspend related flags on config reset" into msm-5.4

parents e4fe3f83 456a371f

drivers/usb/gadget/function/f_cdev.c

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ static void usb_cser_disable(struct usb_function *f) 
		"port(%s) deactivated\n", port->name);



	usb_cser_disconnect(port);

	port->func_is_suspended = false;

	port->func_wakeup_allowed = false;

	port->func_wakeup_pending = false;

	usb_ep_disable(port->port_usb.notify);

	port->port_usb.notify->driver_data = NULL;

drivers/usb/gadget/function/f_gsi.c

+5 −0
Original line number Diff line number Diff line
@@ -2596,6 +2596,11 @@ static void gsi_disable(struct usb_function *f) 
	/* send 0 len pkt to qti/qbi/gps to notify state change */

	gsi_ctrl_send_cpkt_tomodem(gsi, NULL, 0);

	gsi->c_port.notify_req_queued = false;



	gsi->func_is_suspended = false;

	gsi->func_wakeup_allowed = false;

	gsi->func_wakeup_pending = false;



	/* Disable Data Path  - only if it was initialized already (alt=1) */

	if (!gsi->data_interface_up) {

		log_event_dbg("%s: data intf is closed", __func__);