aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-07-12 16:52:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:17:27 -0200
commit8d4c20c960aa9325bd3b9995f518e1f05c374856 (patch)
tree68216ff65844f89dce9040821a8deba9170fa0ec
parentc09d6695bd45bb5ac57d7766e2096fe03effd5cc (diff)
downloadkernel_samsung_smdk4412-8d4c20c960aa9325bd3b9995f518e1f05c374856.zip
kernel_samsung_smdk4412-8d4c20c960aa9325bd3b9995f518e1f05c374856.tar.gz
kernel_samsung_smdk4412-8d4c20c960aa9325bd3b9995f518e1f05c374856.tar.bz2
[media] cx231xx: set correct i2c port for Exeter tuner
The tuner is on i2c port 3 just like all the reference designs. Having it improperly set to port #1 causes the tuner initialization to fail when enabling the device. Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 146e52e..0d358e6 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2344,18 +2344,13 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
if (dev->cx231xx_reset_analog_tuner)
dev->cx231xx_reset_analog_tuner(dev);
} else if ((dev->model == CX231XX_BOARD_CNXT_RDE_253S) ||
- (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) ||
- (dev->model == CX231XX_BOARD_CNXT_RDU_253S)) {
+ (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) ||
+ (dev->model == CX231XX_BOARD_CNXT_RDU_253S) ||
+ (dev->model == CX231XX_BOARD_HAUPPAUGE_EXETER)) {
/* tuner path to channel 1 from port 3 */
cx231xx_enable_i2c_for_tuner(dev, I2C_3);
if (dev->cx231xx_reset_analog_tuner)
dev->cx231xx_reset_analog_tuner(dev);
- } else if (dev->model == CX231XX_BOARD_HAUPPAUGE_EXETER) {
- /* tuner path to channel 1 from port 1 ?? */
- cx231xx_enable_i2c_for_tuner(dev, I2C_1);
-
- if (dev->cx231xx_reset_analog_tuner)
- dev->cx231xx_reset_analog_tuner(dev);
}
break;