Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165e1213 authored by Ian Armstrong's avatar Ian Armstrong Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7279): ivtv: Add missing sg_init_table() 



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: default avatarIan Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c030f5e6

drivers/media/video/ivtv/ivtv-driver.c

+3 −0
Original line number Diff line number Diff line
@@ -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;