From d30c97194af57a1f9b2394130e431dd4fe617357 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 12 Jul 2010 16:52:10 -0300 Subject: [PATCH] --- yaml --- r: 219261 b: refs/heads/master c: 8d4c20c960aa9325bd3b9995f518e1f05c374856 h: refs/heads/master i: 219259: b9e436cd9bd1d50e318caa62aa4df669eee96d22 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-avcore.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f5a7b2828dfa..9481068181e4 100644 --- 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 index 146e52e318eb..0d358e675984 100644 --- 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); }