浏览代码

V4L/DVB (7197): bttv: Fix overlay divide error

The initial work to convert the bttv driver to V4L2 "Partial conversion
from V4L1 to V4L2" (e84619b17440ccca4e4db7583d126c4189b987e5), missed
the line which set the appropriate overlay crop structure in the newly
allocated bttv_buffer.  This then causes a divide error in the
bttv_calc_geo function.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Robert Fitzsimons 17 年之前
父节点
当前提交
7c018804c0
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      drivers/media/video/bt8xx/bttv-driver.c

+ 1 - 0
drivers/media/video/bt8xx/bttv-driver.c

@@ -2760,6 +2760,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
 	if (on) {
 	if (on) {
 		fh->ov.tvnorm = btv->tvnorm;
 		fh->ov.tvnorm = btv->tvnorm;
 		new = videobuf_pci_alloc(sizeof(*new));
 		new = videobuf_pci_alloc(sizeof(*new));
+		new->crop = btv->crop[!!fh->do_crop].rect;
 		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
 		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
 	} else {
 	} else {
 		new = NULL;
 		new = NULL;