From ece38005b5e827115a878ef3d3bde071b6c58ceb Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 6 Aug 2012 10:43:13 -0300
Subject: [PATCH] --- yaml --- r: 330736 b: refs/heads/master c:
 2f65f467b410ad7285ee243336c5d16dad01e847 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a08068bfbe73..6f0f198de2ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77747f7960986e6a2210a837e6c76a68145d0bf9
+refs/heads/master: 2f65f467b410ad7285ee243336c5d16dad01e847
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index cfa6a421c0a2..a6351c49bfd3 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -965,6 +965,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 		f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
 	else
 		f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
+	f->fmt.pix.priv = 0;
 	return 0;
 }