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

Commit c8973440 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Update functions for SSP descriptors"

parents b4001731 d9f0a42e

drivers/usb/gadget/function/f_fs.c

+2 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,7 @@ static int _ffs_func_bind(struct usb_configuration *c, 
			ret = ss_len;

			goto error;

		}

		func->function.ssp_descriptors = func->function.ss_descriptors;

	} else {

		ss_len = 0;

	}
@@ -3476,6 +3477,7 @@ static void ffs_func_unbind(struct usb_configuration *c, 
	func->function.fs_descriptors = NULL;

	func->function.hs_descriptors = NULL;

	func->function.ss_descriptors = NULL;

	func->function.ssp_descriptors = NULL;

	func->interfaces_nums = NULL;



	ffs_event_add(ffs, FUNCTIONFS_UNBIND);

drivers/usb/gadget/function/f_ncm.c

+1 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) 
		fs_ncm_notify_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function,

			ncm_ss_function, NULL);

			ncm_ss_function, ncm_ss_function);

	if (status)

		goto fail;