From 34c0dae9a4e9a1d4088406cfb9482ffe8759f369 Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@kernellabs.com>
Date: Sat, 9 Oct 2010 15:09:17 -0300
Subject: [PATCH] --- yaml --- r: 226207 b: refs/heads/master c:
 bf797165f099296b622bcdcea1126a113e0aaac4 h: refs/heads/master i:   226205:
 2c71761e55dfc9d1171a71d49bae86561b4f88d4   226203:
 650b3db3cf8fb84f29b2b8e4f8bc8e04794935b7   226199:
 cef1ad99934fff01168b50ce09c1480b17ea0f6e   226191:
 d85be88c8eb0f0a92237efe7bf159fc0218581a1   226175:
 230df9ca6e0a01c76092bb531100455581c0c9c2 v: v3

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

diff --git a/[refs] b/[refs]
index 08aa4cd0c5cd..9906b8bc323b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78ca500559b5a4f16a95c198b3e7bdfac8455bf8
+refs/heads/master: bf797165f099296b622bcdcea1126a113e0aaac4
diff --git a/trunk/drivers/media/video/au0828/au0828-video.c b/trunk/drivers/media/video/au0828/au0828-video.c
index cf8fc6274713..48682af911fa 100644
--- a/trunk/drivers/media/video/au0828/au0828-video.c
+++ b/trunk/drivers/media/video/au0828/au0828-video.c
@@ -1116,6 +1116,13 @@ static ssize_t au0828_v4l2_read(struct file *filp, char __user *buf,
 		if (!res_get(fh, AU0828_RESOURCE_VBI))
 			return -EBUSY;
 
+		if (dev->vbi_timeout_running == 0) {
+			/* Handle case where caller tries to read without
+			   calling streamon first */
+			dev->vbi_timeout_running = 1;
+			mod_timer(&dev->vbi_timeout, jiffies + (HZ / 10));
+		}
+
 		return videobuf_read_stream(&fh->vb_vbiq, buf, count, pos, 0,
 					    filp->f_flags & O_NONBLOCK);
 	}