From c1ecc841016eb6b37ee908d028673585a61d2ee9 Mon Sep 17 00:00:00 2001
From: Ming Lei <tom.leiming@gmail.com>
Date: Tue, 16 Sep 2008 03:32:20 -0300
Subject: [PATCH] --- yaml --- r: 113991 b: refs/heads/master c:
 a31a4055473bf0a7b2b06cb2262347200d0711e1 h: refs/heads/master i:   113989:
 851f68fb9ecff0a7f40c9d0ba0a034e6ec36c9e1   113987:
 3e731a70021a4f9fbb343875c00a89f6b65b84e9   113983:
 2b01c23e6991ab3717746c564f42beeb6597f295 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/uvc/uvc_status.c | 11 +++++++++--
 trunk/drivers/media/video/uvc/uvcvideo.h   |  4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 04fac46d64c4..539782f83fcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d63beb9ef004ff9587b3c466361276254d57d7a7
+refs/heads/master: a31a4055473bf0a7b2b06cb2262347200d0711e1
diff --git a/trunk/drivers/media/video/uvc/uvc_status.c b/trunk/drivers/media/video/uvc/uvc_status.c
index 75e678ac54eb..5d60b264d59a 100644
--- a/trunk/drivers/media/video/uvc/uvc_status.c
+++ b/trunk/drivers/media/video/uvc/uvc_status.c
@@ -177,9 +177,15 @@ int uvc_status_init(struct uvc_device *dev)
 
 	uvc_input_init(dev);
 
+	dev->status = kzalloc(UVC_MAX_STATUS_SIZE, GFP_KERNEL);
+	if (dev->status == NULL)
+		return -ENOMEM;
+
 	dev->int_urb = usb_alloc_urb(0, GFP_KERNEL);
-	if (dev->int_urb == NULL)
+	if (dev->int_urb == NULL) {
+		kfree(dev->status);
 		return -ENOMEM;
+	}
 
 	pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
 
@@ -192,7 +198,7 @@ int uvc_status_init(struct uvc_device *dev)
 		interval = fls(interval) - 1;
 
 	usb_fill_int_urb(dev->int_urb, dev->udev, pipe,
-		dev->status, sizeof dev->status, uvc_status_complete,
+		dev->status, UVC_MAX_STATUS_SIZE, uvc_status_complete,
 		dev, interval);
 
 	return usb_submit_urb(dev->int_urb, GFP_KERNEL);
@@ -202,6 +208,7 @@ void uvc_status_cleanup(struct uvc_device *dev)
 {
 	usb_kill_urb(dev->int_urb);
 	usb_free_urb(dev->int_urb);
+	kfree(dev->status);
 	uvc_input_cleanup(dev);
 }
 
diff --git a/trunk/drivers/media/video/uvc/uvcvideo.h b/trunk/drivers/media/video/uvc/uvcvideo.h
index bafe3406e305..9a6bc1aafb16 100644
--- a/trunk/drivers/media/video/uvc/uvcvideo.h
+++ b/trunk/drivers/media/video/uvc/uvcvideo.h
@@ -303,6 +303,8 @@ struct uvc_xu_control {
 #define UVC_MAX_FRAME_SIZE	(16*1024*1024)
 /* Maximum number of video buffers. */
 #define UVC_MAX_VIDEO_BUFFERS	32
+/* Maximum status buffer size in bytes of interrupt URB. */
+#define UVC_MAX_STATUS_SIZE	16
 
 #define UVC_CTRL_CONTROL_TIMEOUT	300
 #define UVC_CTRL_STREAMING_TIMEOUT	1000
@@ -634,7 +636,7 @@ struct uvc_device {
 	/* Status Interrupt Endpoint */
 	struct usb_host_endpoint *int_ep;
 	struct urb *int_urb;
-	__u8 status[16];
+	__u8 *status;
 	struct input_dev *input;
 
 	/* Video Streaming interfaces */