]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[media] cx18: fix kernel oops when setting MPEG control before capturing
authorHans Verkuil <hverkuil@xs4all.nl>
Tue, 25 Jan 2011 21:25:39 +0000 (18:25 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 21 Mar 2011 23:32:19 +0000 (20:32 -0300)
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>
drivers/media/video/cx18/cx18-driver.c

index b988ec62af581fb3cd269ddc2ae6fbb5f588f64f..321c1b79794c05c623833467b74a967059740285 100644 (file)
@@ -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;