---

yaml --- r: 219261 b: refs/heads/master c: 8d4c20c h: refs/heads/master i: 219259: b9e436c v: v3
git-mirror · Oct 21, 2010 · d30c971 · d30c971
1 parent 078eb7b
commit d30c971
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c09d6695bd45bb5ac57d7766e2096fe03effd5cc
+refs/heads/master: 8d4c20c960aa9325bd3b9995f518e1f05c374856
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c b/trunk/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);
 		}