From: Devin Heitmueller Date: Mon, 12 Jul 2010 19:52:10 +0000 (-0300) Subject: [media] cx231xx: set correct i2c port for Exeter tuner X-Git-Tag: MMI-PSA29.97-13-9~21911^2~278 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d4c20c960aa9325bd3b9995f518e1f05c374856;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index 146e52e318eb..0d358e675984 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -2344,16 +2344,11 @@ 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); }