From 15a3a311f23dc8c9bebc0d4eea61343c1c3b64e0 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Tue, 25 Jan 2011 17:08:00 -0300 Subject: [PATCH] --- yaml --- r: 241921 b: refs/heads/master c: 2f2710bd4ee11a06e4c87956be4733566e288a2e h: refs/heads/master i: 241919: ef5b642b7d600088dd0cb81016fd9df9295e312f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/altera-ci.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3f6f2a9c07ce..35d703f543b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 702dd7903bda0b83f6f6cb66fdadc4e5bbb60646 +refs/heads/master: 2f2710bd4ee11a06e4c87956be4733566e288a2e diff --git a/trunk/drivers/media/video/cx23885/altera-ci.c b/trunk/drivers/media/video/cx23885/altera-ci.c index e5c0873aca15..ad6cc68d4b0c 100644 --- a/trunk/drivers/media/video/cx23885/altera-ci.c +++ b/trunk/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);