Revert "USB: composite: Fix USB WHQL Certification Issues"

This reverts commit 7558ae6cd0d401b863f8f8d63fee12348270d045.

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 7e2dacc7974d3aa2e2465ca4b3a5884c461a78fc..9c333f1cc62a5626c1537f7b4d5a9a682b895b3f 100755 (executable)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -765,11 +765,11 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
        case USB_REQ_GET_CONFIGURATION:
                if (ctrl->bRequestType != USB_DIR_IN)
                        goto unknown;
-               if (cdev->config) {
+               if (cdev->config)
                        *(u8 *)req->buf = cdev->config->bConfigurationValue;
-                       value = min(w_length, (u16) 1);
-               } else
+               else
                        *(u8 *)req->buf = 0;
+               value = min(w_length, (u16) 1);
                break;
 
        /* function drivers must handle get/set altsetting; if there's
@@ -819,9 +819,6 @@ unknown:
                 */
                if ((ctrl->bRequestType & USB_RECIP_MASK)
                                == USB_RECIP_INTERFACE) {
-                       if (cdev->config == NULL)
-                               return value;
-
                        f = cdev->config->interface[intf];
                        if (f && f->setup)
                                value = f->setup(f, ctrl);