summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
-rw-r--r--linux/drivers/media/video/tuner-core.c8
1 files changed, 4 insertions, 4 deletions
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);
}
}