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

Commit 56023ce0 authored by Li Jun's avatar Li Jun Committed by Felipe Balbi
Browse files

usb: gadget: audio: allocate and init otg descriptor by otg capabilities 



Allocate and initialize usb otg descriptor according to gadget otg
capabilities, add it for each usb configurations. If otg capability
is not defined, keep its original otg descriptor unchanged.

Signed-off-by: default avatarLi Jun <jun.li@freescale.com>
Reviewed-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 578aa8a2

drivers/usb/gadget/legacy/audio.c

+19 −15
Original line number Diff line number Diff line
@@ -150,20 +150,7 @@ static struct usb_device_descriptor device_desc = { 
	.bNumConfigurations =	1,

};



static struct usb_otg_descriptor otg_descriptor = {

	.bLength =		sizeof otg_descriptor,

	.bDescriptorType =	USB_DT_OTG,



	/* REVISIT SRP-only hardware is possible, although

	 * it would not be called "OTG" ...

	 */

	.bmAttributes =		USB_OTG_SRP | USB_OTG_HNP,

};



static const struct usb_descriptor_header *otg_desc[] = {

	(struct usb_descriptor_header *) &otg_descriptor,

	NULL,

};

static const struct usb_descriptor_header *otg_desc[2];



/*-------------------------------------------------------------------------*/
@@ -259,14 +246,28 @@ static int audio_bind(struct usb_composite_dev *cdev) 
	device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;



	if (gadget_is_otg(cdev->gadget) && !otg_desc[0]) {

		struct usb_descriptor_header *usb_desc;



		usb_desc = usb_otg_descriptor_alloc(cdev->gadget);

		if (!usb_desc)

			goto fail;

		usb_otg_descriptor_init(cdev->gadget, usb_desc);

		otg_desc[0] = usb_desc;

		otg_desc[1] = NULL;

	}



	status = usb_add_config(cdev, &audio_config_driver, audio_do_config);

	if (status < 0)

		goto fail;

		goto fail_otg_desc;

	usb_composite_overwrite_options(cdev, &coverwrite);



	INFO(cdev, "%s, version: %s\n", DRIVER_DESC, DRIVER_VERSION);

	return 0;



fail_otg_desc:

	kfree(otg_desc[0]);

	otg_desc[0] = NULL;

fail:

#ifndef CONFIG_GADGET_UAC1

	usb_put_function_instance(fi_uac2);
@@ -289,6 +290,9 @@ static int audio_unbind(struct usb_composite_dev *cdev) 
	if (!IS_ERR_OR_NULL(fi_uac2))

		usb_put_function_instance(fi_uac2);

#endif

	kfree(otg_desc[0]);

	otg_desc[0] = NULL;



	return 0;

}