diff --git a/[refs] b/[refs]
index 35d703f543b5..1d594df565af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2710bd4ee11a06e4c87956be4733566e288a2e
+refs/heads/master: 7ee9e64a3d7379fd443090880158374181f754cf
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index b988ec62af58..321c1b79794c 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/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;