]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] cx231xx: set correct i2c port for Exeter tuner
authorDevin Heitmueller <dheitmueller@hauppauge.com>
Mon, 12 Jul 2010 19:52:10 +0000 (16:52 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:17:27 +0000 (01:17 -0200)
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>
drivers/media/video/cx231xx/cx231xx-avcore.c

index 146e52e318eb488abebab6d8902c9755ea8cb74a..0d358e675984062f44137e6ce384937a8ea9fd02 100644 (file)
@@ -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);
                }