summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164
diff options
context:
space:
mode:
authorSteven Toth2010-07-31 21:03:55 +0200
committerMauro Carvalho Chehab2010-10-21 11:55:03 +0200
commit32299a1461ef080e9d8808cf1a762c59403ac63b (patch)
tree18f4cc9b0194fff568277d268ba0e486f4c354fb /drivers/media/video/saa7164
parent[media] saa7164: New firmware changes, new size, new filename (diff)
downloadkernel-qcow2-linux-32299a1461ef080e9d8808cf1a762c59403ac63b.tar.gz
kernel-qcow2-linux-32299a1461ef080e9d8808cf1a762c59403ac63b.tar.xz
kernel-qcow2-linux-32299a1461ef080e9d8808cf1a762c59403ac63b.zip
[media] saa7164: Avoid spurious error after firmware starts
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7164')
-rw-r--r--drivers/media/video/saa7164/saa7164-core.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index 8879517d974a..b1efbeae8598 100644
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/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)