---

yaml --- r: 226207 b: refs/heads/master c: bf79716 h: refs/heads/master i: 226205: 2c71761 226203: 650b3db 226199: cef1ad9 226191: d85be88 226175: 230df9c v: v3
git-mirror · Dec 29, 2010 · 34c0dae · 34c0dae
1 parent 17097e7
commit 34c0dae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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);
 	}