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

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

Merge "usb: gadget: f_gsi: Fix return type for name_to_prot_id()"

parents 01c27454 8f7deb4e

drivers/usb/gadget/function/f_gsi.c

+1 −2
Original line number Diff line number Diff line
@@ -3536,10 +3536,9 @@ static struct config_item_type gsi_func_rndis_type = { 
static int gsi_set_inst_name(struct usb_function_instance *fi,

	const char *name)

{

	int name_len, ret = 0;

	int name_len, prot_id, ret = 0;

	struct gsi_opts *opts;

	struct f_gsi *gsi;

	enum usb_prot_id prot_id;



	opts = container_of(fi, struct gsi_opts, func_inst);

drivers/usb/gadget/function/f_gsi.h

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static inline struct gsi_opts *to_gsi_opts(struct config_item *item) 
			    func_inst.group);

}



static enum usb_prot_id name_to_prot_id(const char *name)

static int name_to_prot_id(const char *name)

{

	if (!name)

		goto error;