From f0db2a1dfdf7ae31ae2af202371d7b7e74a6fa9e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <devnull@localhost>
Date: Thu, 7 Jul 2005 03:02:55 +0000
Subject:         * tuner-core.c,tea5767.c:

        - T_STANDBY now is tuner.mode instead of tuner.mode_mask.
          This way, mode_mask is changed only when calling set_type.

        Signed-Off-By: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
 linux/drivers/media/video/tea5767.c    | 4 ++--
 linux/drivers/media/video/tuner-core.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'linux/drivers/media/video')

diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index 6d3f0a3f9..b53c748ca 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.17 2005/07/06 03:33:43 mchehab Exp $
+ * $Id: tea5767.c,v 1.18 2005/07/07 03:02:55 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -206,7 +206,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 		    TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;
 	buffer[4] = 0;
 
-	if (t->mode_mask & T_STANDBY) {
+	if (t->mode == T_STANDBY) {
 		tuner_dbg("TEA5767 set to standby mode\n");
 		buffer[3] |= TEA5767_STDBY;
 	}
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 9f56bbaf6..8885ee603 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.52 2005/07/07 02:41:42 mchehab Exp $
+ * $Id: tuner-core.c,v 1.53 2005/07/07 03:02:55 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -335,7 +335,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 	if (addr == 0x60) {
 		if (tea5767_autodetection(&t->i2c) != EINVAL) {
 			t->type = TUNER_TEA5767;
-			t->mode_mask = T_RADIO | T_STANDBY;
+			t->mode_mask = T_RADIO;
+			t->mode = T_STANDBY;
 			t->freq = 87.5 * 16; /* Sets freq to FM range */
 			default_mode_mask &= ~T_RADIO;
 
@@ -402,7 +403,7 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
 
 		t->mode = mode;
 		if (check_mode(t, cmd) == EINVAL) {
-			t->mode_mask |= T_STANDBY;
+			t->mode = T_STANDBY;
 			if (V4L2_TUNER_RADIO == mode) {
 				set_tv_freq(client, 400 * 16);
 			} else {
@@ -410,7 +411,6 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
 			}
 			return EINVAL;
 		} else {
-			t->mode_mask &= ~T_STANDBY;
 			set_freq (client, t->freq);
 		}
 	}
-- 
cgit v1.2.3