summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRobert Fitzsimons2008-02-13 20:38:11 +0100
committerMauro Carvalho Chehab2008-02-18 16:18:03 +0100
commit7c018804c0900e7be18507f1eb24e631aa9816ea (patch)
tree2269f886d6f584a6a4fcfb5253ef3e77b63a45c2 /drivers/media
parentV4L/DVB (7195): xc5000: fix build error when built as module (diff)
downloadkernel-qcow2-linux-7c018804c0900e7be18507f1eb24e631aa9816ea.tar.gz
kernel-qcow2-linux-7c018804c0900e7be18507f1eb24e631aa9816ea.tar.xz
kernel-qcow2-linux-7c018804c0900e7be18507f1eb24e631aa9816ea.zip
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index d9ce9a48ef59..5404fcc5276d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/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) {
fh->ov.tvnorm = btv->tvnorm;
new = videobuf_pci_alloc(sizeof(*new));
+ new->crop = btv->crop[!!fh->do_crop].rect;
bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
} else {
new = NULL;