From 4119cc5f643dd4c7d7d261582fe2b28f66e37a53 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 19 Sep 2012 10:14:41 -0300
Subject: [PATCH] --- yaml --- r: 333789 b: refs/heads/master c:
 96b1a70226cd43f69c63a7ba2a769bece08cf64e h: refs/heads/master i:   333787:
 7d0a486a06272134444d7882bd245305f4543919 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d79a726077d7..eb18ec82d144 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c0b60618118745220bc0f9bf27e51e37367427c
+refs/heads/master: 96b1a70226cd43f69c63a7ba2a769bece08cf64e
diff --git a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
index 9d3e46c446ad..16205d9bddfc 100644
--- a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2188,6 +2188,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
 	int ret = 0;
 
 	switch (cmd) {
+	case VIDIOC_PREPARE_BUF:
 	case VIDIOC_QUERYBUF:
 	case VIDIOC_QBUF:
 	case VIDIOC_DQBUF: {