From patchwork Tue Jan 25 20:08:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor M. Liplianin" X-Patchwork-Id: 506801 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 p0PKoZD9006763 for ; Tue, 25 Jan 2011 20:51:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753920Ab1AYUtv (ORCPT ); Tue, 25 Jan 2011 15:49:51 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:55203 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753909Ab1AYUtu (ORCPT ); Tue, 25 Jan 2011 15:49:50 -0500 Received: by mail-ey0-f174.google.com with SMTP id 27so173108eye.19 for ; Tue, 25 Jan 2011 12:49:49 -0800 (PST) Received: by 10.213.4.67 with SMTP id 3mr131643ebq.46.1295988589014; Tue, 25 Jan 2011 12:49:49 -0800 (PST) Received: from useri.localnet ([93.125.74.3]) by mx.google.com with ESMTPS id t5sm11419593eeh.20.2011.01.25.12.49.47 (version=SSLv3 cipher=RC4-MD5); Tue, 25 Jan 2011 12:49:48 -0800 (PST) Message-ID: <4d3f376c.857a0e0a.122c.4795@mx.google.com> From: "Igor M. Liplianin" Date: Tue, 25 Jan 2011 22:08:00 +0200 Subject: [PATCH 9/9 v3] cx23885, altera-ci: enable all PID's less than 0x20 in hardware PID filter. To: , , 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 20:51:06 +0000 (UTC) diff --git a/drivers/media/video/cx23885/altera-ci.c b/drivers/media/video/cx23885/altera-ci.c index e5c0873..ad6cc68 100644 --- a/drivers/media/video/cx23885/altera-ci.c +++ b/drivers/media/video/cx23885/altera-ci.c @@ -521,7 +521,8 @@ static void altera_pid_control(struct netup_hw_pid_filter *pid_filt, struct fpga_internal *inter = pid_filt->internal; u8 store = 0; - if (pid == 0x2000) + /* pid 0-0x1f always enabled, don't touch them */ + if ((pid == 0x2000) || (pid < 0x20)) return; mutex_lock(&inter->fpga_mutex); @@ -567,8 +568,9 @@ static void altera_toggle_fullts_streaming(struct netup_hw_pid_filter *pid_filt, netup_fpga_op_rw(inter, NETUP_CI_PID_ADDR1, ((i >> 8) & 0x03) | (pid_filt->nr << 2), 0); - - netup_fpga_op_rw(inter, NETUP_CI_PID_DATA, store, 0); + /* pid 0-0x1f always enabled */ + netup_fpga_op_rw(inter, NETUP_CI_PID_DATA, + (i > 3 ? store : 0), 0); } mutex_unlock(&inter->fpga_mutex);