From f3c569aa0ee2bdc38dd24408dc4aef0236a8cede Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 31 Jul 2010 16:03:55 -0300 Subject: [PATCH] --- yaml --- r: 219381 b: refs/heads/master c: 32299a1461ef080e9d8808cf1a762c59403ac63b h: refs/heads/master i: 219379: 7d6bdcaeaf9e732bb92707aaafd00f3c92dd2c07 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-core.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 33c6174f20f5..e78d1f50d02e 100644 --- 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 index 8879517d974a..b1efbeae8598 100644 --- 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)