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

Commit 64e1b298 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: f_gsi: Do not override config item name"

parents 6ffc21ae d46ba472

drivers/usb/gadget/function/f_gsi.c

+3 −2
Original line number Diff line number Diff line
@@ -3653,7 +3653,8 @@ static int gsi_set_inst_name(struct usb_function_instance *fi, 
	}



	if (prot_id == USB_PROT_RNDIS_IPA)

		config_group_init_type_name(&opts->func_inst.group, "",

		config_group_init_type_name(&opts->func_inst.group,

						fi->group.cg_item.ci_name,

						&gsi_func_rndis_type);

	if (prot_id == IPA_USB_MBIM) {

		opts->os_desc.ext_compat_id = opts->ext_compat_id;