summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-risc.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-03-12 22:29:43 -0600
committerMike Isely <isely@pobox.com>2006-03-12 22:29:43 -0600
commitbb379778f6c9c6aa4dc340c342d5e81a0b9026dd (patch)
tree3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/drivers/media/video/bttv-risc.c
parentf9533819a70608d97d03abd7766ffc3f1e3ea655 (diff)
parent3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff)
downloadmediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.gz
mediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.bz2
Merge from master
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/bttv-risc.c')
-rw-r--r--linux/drivers/media/video/bttv-risc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bttv-risc.c b/linux/drivers/media/video/bttv-risc.c
index 4efe74dd8..512ea01ee 100644
--- a/linux/drivers/media/video/bttv-risc.c
+++ b/linux/drivers/media/video/bttv-risc.c
@@ -277,6 +277,8 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
if (line > maxy)
btcx_calc_skips(line, ov->w.width, &maxy,
skips, &nskips, ov->clips, ov->nclips);
+ else
+ nskips = 0;
/* write out risc code */
for (start = 0, skip = 0; start < ov->w.width; start = end) {