USB: Gadget: Composite: Debug interface comparison

While checking valid interface number we should compare MAX_CONFIG_INTERFACES
with the variable 'intf' (which holds the lower 8bits of w_index) rather than
'w_index'

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 1ba4befe336b6b77741f163510c6e5890e7d0df6..bbbbfb70750428c00f217738ae08a10362b83906 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -887,7 +887,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
        case USB_REQ_SET_INTERFACE:
                if (ctrl->bRequestType != USB_RECIP_INTERFACE)
                        goto unknown;
-               if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+               if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)
                        break;
                f = cdev->config->interface[intf];
                if (!f)
@@ -899,7 +899,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
        case USB_REQ_GET_INTERFACE:
                if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))
                        goto unknown;
-               if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+               if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)
                        break;
                f = cdev->config->interface[intf];
                if (!f)
@@ -928,7 +928,7 @@ unknown:
                 */
                switch (ctrl->bRequestType & USB_RECIP_MASK) {
                case USB_RECIP_INTERFACE:
-                       if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+                       if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)
                                break;
                        f = cdev->config->interface[intf];
                        break;