Hi Matt,

On Tuesday, January 25, 2011 03:10:38 Matt Janus wrote:
> A quick test with mplayer didn't error, when i tried to use mythtv the driver 
> crashed and resulted in this:

I could reproduce this and the fix is below. Please test!

Regards,

        Hans

>From 6b7c84508e915f26a9b701ef2f5fa0b92ca62f2f Mon Sep 17 00:00:00 2001
Message-Id: 
<6b7c84508e915f26a9b701ef2f5fa0b92ca62f2f.1295990866.git.hverk...@xs4all.nl>
From: Hans Verkuil <hverk...@xs4all.nl>
Date: Tue, 25 Jan 2011 22:25:39 +0100
Subject: [PATCH] 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 <hverk...@xs4all.nl>
---
 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 869690b..877e201 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -713,6 +713,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;
-- 
1.7.0.4


-- 
Hans Verkuil - video4linux developer - sponsored by Cisco
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to