From f9611833b213605d35d74576ccd349a22fba5527 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 29 Sep 2010 11:07:08 -0300
Subject: [PATCH] --- yaml --- r: 226177 b: refs/heads/master c:
 55fa288deca4b17e539ba49a9b0d0ed474afa6f8 h: refs/heads/master i:   226175:
 230df9ca6e0a01c76092bb531100455581c0c9c2 v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/media/video/cx231xx/cx231xx-cards.c | 11 +++++++++++
 trunk/drivers/media/video/cx231xx/cx231xx-core.c  |  1 -
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3361c350d43b..6d068f62a983 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ede676c72d0b18f1c15300f7874370e771489a1c
+refs/heads/master: 55fa288deca4b17e539ba49a9b0d0ed474afa6f8
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
index 4d0ab458fa64..400447fbf7fb 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -34,6 +34,7 @@
 #include <media/cx25840.h>
 #include "dvb-usb-ids.h"
 #include "xc5000.h"
+#include "tda18271.h"
 
 #include "cx231xx.h"
 
@@ -490,6 +491,16 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg)
 					       1);
 			msleep(10);
 		}
+	} else if (dev->tuner_type == TUNER_NXP_TDA18271) {
+		switch (command) {
+		case TDA18271_CALLBACK_CMD_AGC_ENABLE:
+			if (dev->model == CX231XX_BOARD_PV_PLAYTV_USB_HYBRID)
+				rc = cx231xx_set_agc_analog_digital_mux_select(dev, arg);
+			break;
+		default:
+			rc = -EINVAL;
+			break;
+		}
 	}
 	return rc;
 }
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-core.c b/trunk/drivers/media/video/cx231xx/cx231xx-core.c
index 5664bdf7785d..d6028c92b6f2 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-core.c
@@ -719,7 +719,6 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)
 			break;
 		case CX231XX_BOARD_CNXT_RDE_253S:
 		case CX231XX_BOARD_CNXT_RDU_253S:
-		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
 			errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 1);
 			break;
 		case CX231XX_BOARD_HAUPPAUGE_EXETER: