]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (7279): ivtv: Add missing sg_init_table()
authorIan Armstrong <ian@iarmst.demon.co.uk>
Tue, 26 Feb 2008 19:09:00 +0000 (16:09 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Thu, 20 Mar 2008 15:38:59 +0000 (12:38 -0300)
If a dma transfer is attempted for either yuv or framebuffer output, a missing
sg_init_table() call causes a kernel BUG in scatterlist.h if CONFIG_DEBUG_SG
is set.

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/ivtv/ivtv-driver.c

index 9d36ab999141ef27dfcfa41fa6962da0d409b0de..948ca35e7ee897469eafd905c0ffb4432dd4fc76 100644 (file)
@@ -699,6 +699,9 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
        itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
        itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;
 
+       /* Init the sg table for osd/yuv output */
+       sg_init_table(itv->udma.SGlist, IVTV_DMA_SG_OSD_ENT);
+
        /* OSD */
        itv->osd_global_alpha_state = 1;
        itv->osd_global_alpha = 255;