From 2e14840b96451a40adddacfe26f0398011e9e835 Mon Sep 17 00:00:00 2001
From: Bhupesh Sharma <bhupesh.sharma@st.com>
Date: Fri, 1 Jun 2012 15:08:55 +0530
Subject: [PATCH] --- yaml --- r: 316901 b: refs/heads/master c:
 5797663674b0d802f275761e71593b32b0849242 h: refs/heads/master i:   316899:
 609140ab052640e047dc6c3f2af2a1b88b28d3a8 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/f_uvc.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e5b34d43eb67..bdc8fa8915f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de6e63f7845e99981e489ddccf70b3ec02fe00a
+refs/heads/master: 5797663674b0d802f275761e71593b32b0849242
diff --git a/trunk/drivers/usb/gadget/f_uvc.c b/trunk/drivers/usb/gadget/f_uvc.c
index 054c35a22fbf..dd7d7a98ed43 100644
--- a/trunk/drivers/usb/gadget/f_uvc.c
+++ b/trunk/drivers/usb/gadget/f_uvc.c
@@ -59,6 +59,8 @@ static struct usb_gadget_strings *uvc_function_strings[] = {
 #define UVC_INTF_VIDEO_CONTROL			0
 #define UVC_INTF_VIDEO_STREAMING		1
 
+#define STATUS_BYTECOUNT			16	/* 16 bytes status */
+
 static struct usb_interface_assoc_descriptor uvc_iad __initdata = {
 	.bLength		= sizeof(uvc_iad),
 	.bDescriptorType	= USB_DT_INTERFACE_ASSOCIATION,
@@ -87,7 +89,7 @@ static struct usb_endpoint_descriptor uvc_control_ep __initdata = {
 	.bDescriptorType	= USB_DT_ENDPOINT,
 	.bEndpointAddress	= USB_DIR_IN,
 	.bmAttributes		= USB_ENDPOINT_XFER_INT,
-	.wMaxPacketSize		= cpu_to_le16(16),
+	.wMaxPacketSize		= cpu_to_le16(STATUS_BYTECOUNT),
 	.bInterval		= 8,
 };
 
@@ -95,7 +97,7 @@ static struct uvc_control_endpoint_descriptor uvc_control_cs_ep __initdata = {
 	.bLength		= UVC_DT_CONTROL_ENDPOINT_SIZE,
 	.bDescriptorType	= USB_DT_CS_ENDPOINT,
 	.bDescriptorSubType	= UVC_EP_INTERRUPT,
-	.wMaxTransferSize	= cpu_to_le16(16),
+	.wMaxTransferSize	= cpu_to_le16(STATUS_BYTECOUNT),
 };
 
 static struct usb_interface_descriptor uvc_streaming_intf_alt0 __initdata = {