---

yaml --- r: 219381 b: refs/heads/master c: 32299a1 h: refs/heads/master i: 219379: 7d6bdca v: v3
git-mirror · Oct 21, 2010 · f3c569a · f3c569a
1 parent 9817dd0
commit f3c569a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b9db2d856793526abf59b5366d2dd7b04c92b7
+refs/heads/master: 32299a1461ef080e9d8808cf1a762c59403ac63b
diff --git a/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c
@@ -163,14 +163,21 @@ static void saa7164_ts_verifier(struct saa7164_buffer *buf)
 
 	}
 
-	if (port->v_cc_errors)
+	/* Only report errors if we've been through this function atleast
+	 * once already and the cached cc values are primed. First time through
+	 * always generates errors.
+	 */
+	if (port->v_cc_errors && (port->done_first_interrupt > 1))
 		printk(KERN_ERR "video pid cc, %d errors\n", port->v_cc_errors);
 
-	if (port->a_cc_errors)
+	if (port->a_cc_errors && (port->done_first_interrupt > 1))
 		printk(KERN_ERR "audio pid cc, %d errors\n", port->a_cc_errors);
 
-	if (port->sync_errors)
+	if (port->sync_errors && (port->done_first_interrupt > 1))
 		printk(KERN_ERR "sync_errors = %d\n", port->sync_errors);
+
+	if (port->done_first_interrupt == 1)
+		port->done_first_interrupt++;
 }
 
 static void saa7164_histogram_reset(struct saa7164_histogram *hg, char *name)