Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / gadget / composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 8572dad5ecbbffd0e0eb71ece46559b30ca6f796..1ba4befe336b6b77741f163510c6e5890e7d0df6 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -928,8 +928,9 @@ unknown:
                 */
                switch (ctrl->bRequestType & USB_RECIP_MASK) {
                case USB_RECIP_INTERFACE:
-                       if (cdev->config)
-                               f = cdev->config->interface[intf];
+                       if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+                               break;
+                       f = cdev->config->interface[intf];
                        break;
 
                case USB_RECIP_ENDPOINT:
@@ -1126,7 +1127,7 @@ static int composite_bind(struct usb_gadget *gadget)
        if (bcdDevice)
                cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
 
-       /* stirng overrides */
+       /* string overrides */
        if (iManufacturer || !cdev->desc.iManufacturer) {
                if (!iManufacturer && !composite->iManufacturer &&
                    !*composite_manufacturer)
@@ -1188,6 +1189,8 @@ composite_suspend(struct usb_gadget *gadget)
                composite->suspend(cdev);
 
        cdev->suspended = 1;
+
+       usb_gadget_vbus_draw(gadget, 2);
 }
 
 static void
@@ -1195,6 +1198,7 @@ composite_resume(struct usb_gadget *gadget)
 {
        struct usb_composite_dev        *cdev = get_gadget_data(gadget);
        struct usb_function             *f;
+       u8                              maxpower;
 
        /* REVISIT:  should we have config level
         * suspend/resume callbacks?
@@ -1207,6 +1211,11 @@ composite_resume(struct usb_gadget *gadget)
                        if (f->resume)
                                f->resume(f);
                }
+
+               maxpower = cdev->config->bMaxPower;
+
+               usb_gadget_vbus_draw(gadget, maxpower ?
+                       (2 * maxpower) : CONFIG_USB_GADGET_VBUS_DRAW);
        }
 
        cdev->suspended = 0;