openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: gadget: cdc2: 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: Li Jun <jun.li@freescale.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Li Jun 2015-07-09 15:18:52 +08:00 committed by Felipe Balbi
parent 56023ce0fd
commit ab6796ae98
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/usb/gadget/legacy/cdc2.c
View File

@ -60,21 +60,7 @@ static struct usb_device_descriptor device_desc = {
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
static struct usb_otg_descriptor otg_descriptor = { static const struct usb_descriptor_header *otg_desc[2];
.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,
};
/* string IDs are assigned dynamically */ /* string IDs are assigned dynamically */
static struct usb_string strings_dev[] = { static struct usb_string strings_dev[] = {
@ -193,10 +179,21 @@ static int cdc_bind(struct usb_composite_dev *cdev)
device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id; device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;
device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id; device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
if (gadget_is_otg(gadget) && !otg_desc[0]) {
struct usb_descriptor_header *usb_desc;
usb_desc = usb_otg_descriptor_alloc(gadget);
if (!usb_desc)
goto fail1;
usb_otg_descriptor_init(gadget, usb_desc);
otg_desc[0] = usb_desc;
otg_desc[1] = NULL;
}
/* register our configuration */ /* register our configuration */
status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config); status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config);
if (status < 0) if (status < 0)
goto fail1; goto fail2;
usb_composite_overwrite_options(cdev, &coverwrite); usb_composite_overwrite_options(cdev, &coverwrite);
dev_info(&gadget->dev, "%s, version: " DRIVER_VERSION "\n", dev_info(&gadget->dev, "%s, version: " DRIVER_VERSION "\n",
@ -204,6 +201,9 @@ static int cdc_bind(struct usb_composite_dev *cdev)
return 0; return 0;
fail2:
kfree(otg_desc[0]);
otg_desc[0] = NULL;
fail1: fail1:
usb_put_function_instance(fi_serial); usb_put_function_instance(fi_serial);
fail: fail:
@ -219,6 +219,9 @@ static int cdc_unbind(struct usb_composite_dev *cdev)
usb_put_function(f_ecm); usb_put_function(f_ecm);
if (!IS_ERR_OR_NULL(fi_ecm)) if (!IS_ERR_OR_NULL(fi_ecm))
usb_put_function_instance(fi_ecm); usb_put_function_instance(fi_ecm);
kfree(otg_desc[0]);
otg_desc[0] = NULL;
return 0; return 0;
} }