From 258d10363551562f1f4677902c8b277abfc0ec68 Mon Sep 17 00:00:00 2001 From: Jared Suttles Date: Fri, 7 Aug 2009 18:57:49 -0500 Subject: [PATCH 072/696] USB: composite: Fix USB WHQL Certification Issues Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood --- drivers/usb/gadget/composite.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a1a54b4..07bb37e 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -894,11 +894,12 @@ 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; - else + value = min(w_length, (u16) 1); + } else { *(u8 *)req->buf = 0; - value = min(w_length, (u16) 1); + } break; /* function drivers must handle get/set altsetting; if there's -- 1.7.1