diff options
author | Robert Fitzsimons <robfitz@273k.net> | 2008-02-13 14:38:11 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 10:18:03 -0500 |
commit | 7c018804c0900e7be18507f1eb24e631aa9816ea (patch) | |
tree | 2269f886d6f584a6a4fcfb5253ef3e77b63a45c2 /drivers/media/video/bt8xx/bttv-driver.c | |
parent | c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1 (diff) |
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/video/bt8xx/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 1 |
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) | |||
2760 | if (on) { | 2760 | if (on) { |
2761 | fh->ov.tvnorm = btv->tvnorm; | 2761 | fh->ov.tvnorm = btv->tvnorm; |
2762 | new = videobuf_pci_alloc(sizeof(*new)); | 2762 | new = videobuf_pci_alloc(sizeof(*new)); |
2763 | new->crop = btv->crop[!!fh->do_crop].rect; | ||
2763 | bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new); | 2764 | bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new); |
2764 | } else { | 2765 | } else { |
2765 | new = NULL; | 2766 | new = NULL; |