Merge "usb: gsi: Allocate strings IDs for functions on every bind" (6d6ceea9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_gsi.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -2607,10 +2607,6 @@ static int gsi_update_function_bind_params(struct f_gsi *gsi,
		struct usb_function *f = &gsi->function;
		int status;

		/* maybe allocate device-global string IDs */
		if (info->string_defs[0].id != 0)
		goto skip_string_id_alloc;

		if (info->ctrl_str_idx >= 0 && info->ctrl_desc) {
		/* ctrl interface label */
		status = usb_string_id(cdev);
		@@ -2647,7 +2643,6 @@ static int gsi_update_function_bind_params(struct f_gsi *gsi,
		info->cdc_eth_desc->iMACAddress = status;
		}

		skip_string_id_alloc:
		if (info->ctrl_desc)
		info->ctrl_desc->bInterfaceNumber = gsi->ctrl_id;