Merge "usb: gadget: f_gsi: Remove gadget restart while composition switch" (81b981cf) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/gadget/function/f_gsi.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ MODULE_PARM_DESC(num_out_bufs,
		"Number of OUT buffers");

		static struct workqueue_struct *ipa_usb_wq;
		static bool gadget_restarted;

		struct usb_gsi_debugfs {
		struct dentry *debugfs_root;
		@@ -2759,7 +2758,6 @@ static void gsi_unbind(struct usb_configuration c, struct usb_function f)
		*/
		flush_workqueue(gsi->d_port.ipa_usb_wq);
		ipa_usb_deinit_teth_prot(gsi->prot_id);
		gadget_restarted = false;

		if (gsi->prot_id == IPA_USB_RNDIS) {
		gsi->d_port.sm_state = STATE_UNINITIALIZED;
		@@ -2822,11 +2820,6 @@ int gsi_bind_config(struct usb_configuration *c, enum ipa_usb_teth_prot prot_id)
		return -EINVAL;
		}

		if (!gadget_restarted) {
		usb_gadget_restart(c->cdev->gadget);
		gadget_restarted = true;
		}

		switch (prot_id) {
		case IPA_USB_RNDIS:
		gsi->function.name = "rndis";