From 57ecc7cc6599be48dedb12f66c2492738dc4b34e Mon Sep 17 00:00:00 2001 From: Ian Armstrong Date: Tue, 26 Feb 2008 16:09:00 -0300 Subject: [PATCH] --- yaml --- r: 87537 b: refs/heads/master c: 165e1213e13b49761f8b3fd9314701f83cf3db3a h: refs/heads/master i: 87535: 6c85178cc6215808046fcf476590c1956e40f751 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 45231943b171..01b5b0d88731 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c030f5e697af1127002a0aeffcd259f9bcff5471 +refs/heads/master: 165e1213e13b49761f8b3fd9314701f83cf3db3a diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c index 9d36ab999141..948ca35e7ee8 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-driver.c +++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c @@ -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;