From patchwork Tue Jan 25 21:29:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 507031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0PLSMtr026693 for ; Tue, 25 Jan 2011 21:31:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754052Ab1AYV3w (ORCPT ); Tue, 25 Jan 2011 16:29:52 -0500 Received: from smtp-vbr14.xs4all.nl ([194.109.24.34]:1466 "EHLO smtp-vbr14.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753792Ab1AYV3w convert rfc822-to-8bit (ORCPT ); Tue, 25 Jan 2011 16:29:52 -0500 Received: from tschai.localnet (43.80-203-71.nextgentel.com [80.203.71.43]) (authenticated bits=0) by smtp-vbr14.xs4all.nl (8.13.8/8.13.8) with ESMTP id p0PLTd8Q080710 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Jan 2011 22:29:41 +0100 (CET) (envelope-from hverkuil@xs4all.nl) From: Hans Verkuil To: Matt Janus Subject: Re: oops cx2341x control handler Date: Tue, 25 Jan 2011 22:29:35 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-tschai; KDE/4.4.5; x86_64; ; ) Cc: linux-media@vger.kernel.org, Andy Walls References: <9AA38BEC-4364-4F45-968B-E33BA5098C34@mattjan.us> In-Reply-To: <9AA38BEC-4364-4F45-968B-E33BA5098C34@mattjan.us> MIME-Version: 1.0 Message-Id: <201101252229.35418.hverkuil@xs4all.nl> X-Virus-Scanned: by XS4ALL Virus Scanner Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 25 Jan 2011 21:31:11 +0000 (UTC) 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;