Merge "usb: gadget: f_gsi: Fix alternate index returned by gsi_get_alt" (6f8c5d94) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/gadget/function/f_gsi.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2311,7 +2311,11 @@ static int gsi_get_alt(struct usb_function *f, unsigned intf)
		{
		struct f_gsi *gsi = func_to_gsi(f);

		if (intf == gsi->ctrl_id)
		/* RNDIS, RMNET and DPL only support alt 0*/
		if (intf == gsi->ctrl_id \|\|
		gsi->prot_id == IPA_USB_RNDIS \|\|
		gsi->prot_id == IPA_USB_RMNET \|\|
		gsi->prot_id == IPA_USB_DIAG)
		return 0;
		else if (intf == gsi->data_id)
		return gsi->data_interface_up;