summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-01-25 22:25:39 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 00:32:19 +0100
commit7ee9e64a3d7379fd443090880158374181f754cf (patch)
tree781e8f25c49850125101fb8be13880b89ad9f54d /drivers/media/video
parent[media] cx23885, altera-ci: enable all PID's less than 0x20 in hardware PID f... (diff)
downloadlinux-7ee9e64a3d7379fd443090880158374181f754cf.tar.xz
linux-7ee9e64a3d7379fd443090880158374181f754cf.zip
[media] cx18: fix kernel oops when setting MPEG control before capturing
The cxhdl->priv field was not set initially, only after capturing started. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx18/cx18-driver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index b988ec62af58..321c1b79794c 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -734,6 +734,7 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
cx->cxhdl.ops = &cx18_cxhdl_ops;
cx->cxhdl.func = cx18_api_func;
+ cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
ret = cx2341x_handler_init(&cx->cxhdl, 50);
if (ret)
return ret;