From 6a56b727295919e6affd95820ff80494400c8e52 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 31 Dec 2010 12:30:56 -0300
Subject: [PATCH] --- yaml --- r: 226423 b: refs/heads/master c:
 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2 h: refs/heads/master i:   226421:
 675f26ead358617c399344d60329174f2060a06f   226419:
 70489156757d0688c8bd7a8cb75f0f80b30150ab   226415:
 53f8f16dac369b2713a5e11483856738e5551d32 v: v3

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

diff --git a/[refs] b/[refs]
index ec8aaecb626f..a2d9936e81ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c8fc77e481a3bfc243336085a3fe1fc71f9c1fb
+refs/heads/master: 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
index fe84f17c65c4..7c3921de9589 100644
--- a/trunk/drivers/media/video/zoran/zoran_driver.c
+++ b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -2216,6 +2216,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
 			res = -EAGAIN;
 			goto dqbuf_unlock_and_return;
 		}
+		bs.frame = 0; /* suppress compiler warning */
 		res = jpg_sync(fh, &bs);
 		if (res)
 			goto dqbuf_unlock_and_return;