Re: [PATCH v6 22/23] usb: gadget: serial: allocate and init otg descriptor by otg capabilities

[Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>]

On 29/06/15 10:48, Li Jun wrote:
> 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-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> ---
>   drivers/usb/gadget/legacy/serial.c | 29 +++++++++++++++--------------
>   1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c
> index 8b7528f..d1cd025 100644
> --- a/drivers/usb/gadget/legacy/serial.c
> +++ b/drivers/usb/gadget/legacy/serial.c
> @@ -79,20 +79,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];
>
>   /*-------------------------------------------------------------------------*/
>
> @@ -191,6 +178,16 @@ static int gs_bind(struct usb_composite_dev *cdev)
>   	serial_config_driver.iConfiguration = status;
>
>   	if (gadget_is_otg(cdev->gadget)) {
> +		if (!otg_desc[0]) {
> +			struct usb_descriptor_header *usb_desc;
> +
> +			usb_desc = usb_otg_descriptor_alloc(cdev->gadget);
> +			if (!usb_desc)
> +				return -ENOMEM;
> +			usb_otg_descriptor_init(cdev->gadget, usb_desc);
> +			otg_desc[0] = usb_desc;
> +			otg_desc[1] = NULL;
> +		}
>   		serial_config_driver.descriptors = otg_desc;
>   		serial_config_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
>   	}

There is a failure condition in gs_bind() and you need to free the
otg_descriptor there.

> @@ -227,6 +224,10 @@ static int gs_unbind(struct usb_composite_dev *cdev)
>   		usb_put_function(f_serial[i]);
>   		usb_put_function_instance(fi_serial[i]);
>   	}
> +
> +	kfree(otg_desc[0]);
> +	otg_desc[0] = NULL;
> +
>   	return 0;
>   }
>
>

cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html