diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-02-26 17:09:00 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-02-26 17:09:00 +0100 |
| commit | 3d93e47b381c2726960239773bcd2b161a1143b9 (patch) | |
| tree | 680ed759c016b3816354ba9736bdc3f381f72d61 /linux/drivers/media/video | |
| parent | e62b2d9c5b8121e5b6325b2337cb60fd64bfba9c (diff) | |
| download | mediapointer-dvb-s2-3d93e47b381c2726960239773bcd2b161a1143b9.tar.gz mediapointer-dvb-s2-3d93e47b381c2726960239773bcd2b161a1143b9.tar.bz2 | |
ivtv: Add missing sg_init_table()
From: Ian Armstrong <ian@iarmst.demon.co.uk>
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>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index 56ae17af3..320bf39cb 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -703,6 +703,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; |