From patchwork Sun Jan 2 16:48:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abylai Ospan X-Patchwork-Id: 446401 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 p02Gowjo029074 for ; Sun, 2 Jan 2011 16:50:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754262Ab1ABQug (ORCPT ); Sun, 2 Jan 2011 11:50:36 -0500 Received: from utm.netup.ru ([193.203.36.250]:47405 "EHLO utm.netup.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753471Ab1ABQuf (ORCPT ); Sun, 2 Jan 2011 11:50:35 -0500 Received: from alkaloid.netup.ru (alkaloid.netup [10.1.2.137]) by utm.netup.ru (Postfix) with ESMTP id 14FFA35FC7D; Sun, 2 Jan 2011 19:43:35 +0300 (MSK) Message-ID: <4D20AC49.3030905@netup.ru> Date: Sun, 02 Jan 2011 16:48:09 +0000 From: Abylay Ospan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: mchehab@infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5 v2] Fix CI code for NetUP Dual DVB-T/C CI RF card 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.3 (demeter1.kernel.org [140.211.167.41]); Sun, 02 Jan 2011 16:50:58 +0000 (UTC) diff --git a/drivers/media/video/cx23885/altera-ci.c b/drivers/media/video/cx23885/altera-ci.c index e2c9fee..aa67a33 100644 --- a/drivers/media/video/cx23885/altera-ci.c +++ b/drivers/media/video/cx23885/altera-ci.c @@ -283,7 +283,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, netup_fpga_op_rw(inter, NETUP_CI_ADDR1, ((addr >> 7) & 0x7f), 0); store = netup_fpga_op_rw(inter, NETUP_CI_BUSCTRL, 0, NETUP_CI_FLG_RD); - store &= 0x3f; + store &= 0x0f; store |= ((state->nr << 7) | (flag << 6)); netup_fpga_op_rw(inter, NETUP_CI_BUSCTRL, store, 0); @@ -340,19 +340,25 @@ int netup_ci_slot_reset(struct dvb_ca_en50221