Merge "usb: f_gsi: Set alt to 1 for rndis, rmnet and dpl unconditionally" (d4dd9e52) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_gsi.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -2081,13 +2081,8 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf,
		/* for rndis and rmnet alt is always 0 update alt accordingly */
		if (gsi->prot_id == IPA_USB_RNDIS \|\|
		gsi->prot_id == IPA_USB_RMNET \|\|
		gsi->prot_id == IPA_USB_DIAG) {
		if (gsi->d_port.in_ep &&
		!gsi->d_port.in_ep->driver_data)
		gsi->prot_id == IPA_USB_DIAG)
		alt = 1;
		else
		alt = 0;
		}

		if (alt > 1)
		goto notify_ep_disable;