Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / drivers / usb / gadget / composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index ebb5131a9cbd2786244184d05aa6fa4a77aade75..7bd25629c8ca5124b009df2b06dd423334ed7898 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -4,19 +4,7 @@
  * Copyright (C) 2006-2008 David Brownell
  * U-boot porting: Lukasz Majewski <l.majewski@samsung.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #undef DEBUG
 
@@ -859,6 +847,25 @@ unknown:
                        if (&f->list == &cdev->config->functions)
                                f = NULL;
                        break;
+               /*
+                * dfu-util (version 0.5) sets bmRequestType.Receipent = Device
+                * for non-standard request (w_value = 0x21,
+                * bRequest = GET_DESCRIPTOR in this case).
+                * When only one interface is registered (as it is done now),
+                * then this request shall be handled as it was requested for
+                * interface.
+                *
+                * In the below code it is checked if only one interface is
+                * present and proper function for it is extracted. Due to that
+                * function's setup (f->setup) is called to handle this
+                * special non-standard request.
+                */
+               case USB_RECIP_DEVICE:
+                       debug("cdev->config->next_interface_id: %d intf: %d\n",
+                              cdev->config->next_interface_id, intf);
+                       if (cdev->config->next_interface_id == 1)
+                               f = cdev->config->interface[intf];
+                       break;
                }
 
                if (f && f->setup)
@@ -978,7 +985,8 @@ static int composite_bind(struct usb_gadget *gadget)
        if (status < 0)
                goto fail;
 
-       cdev->desc = *composite->dev;
+       memcpy(&cdev->desc, composite->dev,
+              sizeof(struct usb_device_descriptor));
        cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 
        debug("%s: ready\n", composite->name);
@@ -1079,4 +1087,5 @@ void usb_composite_unregister(struct usb_composite_driver *driver)
        if (composite != driver)
                return;
        usb_gadget_unregister_driver(&composite_driver);
+       composite = NULL;
 }