[9/9,v2] cx23885, altera-ci: enable all PID's less than 0x20 in hardware PID filter.

Commit Message

Igor M. Liplianin Jan. 2, 2011, 12:08 p.m. UTC

None

Patch

diff --git a/drivers/media/video/cx23885/altera-ci.c b/drivers/media/video/cx23885/altera-ci.c
index 019797b..e2c9fee 100644
--- a/drivers/media/video/cx23885/altera-ci.c
+++ b/drivers/media/video/cx23885/altera-ci.c
@@ -646,8 +646,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);
@@ -724,8 +725,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);