Re: [PATCH v6 21/23] usb: gadget: printer: 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/printer.c | 26 +++++++++++++++-----------
>   1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
> index 1ce7df1..2ad1124 100644
> --- a/drivers/usb/gadget/legacy/printer.c
> +++ b/drivers/usb/gadget/legacy/printer.c
> @@ -82,16 +82,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,
> -	.bmAttributes =         USB_OTG_SRP,
> -};
> -
> -static const struct usb_descriptor_header *otg_desc[] = {
> -	(struct usb_descriptor_header *) &otg_descriptor,
> -	NULL,
> -};
> +static const struct usb_descriptor_header *otg_desc[2];
>
>   /*-------------------------------------------------------------------------*/
>
> @@ -136,7 +127,6 @@ static int printer_do_config(struct usb_configuration *c)
>   	usb_gadget_set_selfpowered(gadget);
>
>   	if (gadget_is_otg(gadget)) {
> -		otg_descriptor.bmAttributes |= USB_OTG_HNP;
>   		printer_cfg_driver.descriptors = otg_desc;
>   		printer_cfg_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
>   	}
> @@ -182,6 +172,17 @@ static int printer_bind(struct usb_composite_dev *cdev)
>   	device_desc.iProduct = strings[USB_GADGET_PRODUCT_IDX].id;
>   	device_desc.iSerialNumber = strings[USB_GADGET_SERIAL_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)
> +			return -ENOMEM;
> +		usb_otg_descriptor_init(cdev->gadget, usb_desc);
> +		otg_desc[0] = usb_desc;
> +		otg_desc[1] = NULL;
> +	}
> +
>   	ret = usb_add_config(cdev, &printer_cfg_driver, printer_do_config);
>   	if (ret) {

You need to free the otg descriptor here.

>   		usb_put_function_instance(fi_printer);
> @@ -196,6 +197,9 @@ static int printer_unbind(struct usb_composite_dev *cdev)
>   	usb_put_function(f_printer);
>   	usb_put_function_instance(fi_printer);
>
> +	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