diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2011-01-25 18:25:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 20:32:19 -0300 |
| commit | 7ee9e64a3d7379fd443090880158374181f754cf (patch) | |
| tree | 781e8f25c49850125101fb8be13880b89ad9f54d | |
| parent | 2f2710bd4ee11a06e4c87956be4733566e288a2e (diff) | |
| download | op-kernel-dev-7ee9e64a3d7379fd443090880158374181f754cf.zip op-kernel-dev-7ee9e64a3d7379fd443090880158374181f754cf.tar.gz | |
[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>
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 1 |
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 b988ec6..321c1b7 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; |
