From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 25 Jan 2011 21:25:39 +0000 (-0300)
Subject: [media] cx18: fix kernel oops when setting MPEG control before capturing
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ee9e64a3d7379fd443090880158374181f754cf;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[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>
---

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;