summaryrefslogtreecommitdiffstats
path: root/drivers/char/tuner.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
commit168660f24dfc46c2702acbe4701a446f42a59578 (patch)
treef431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/char/tuner.c
parent6420f767924fa73b0ea267864d96820815f4ba5a (diff)
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/char/tuner.c')
-rw-r--r--drivers/char/tuner.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tuner.c b/drivers/char/tuner.c
index 81e19a4ab..dfbf0f6af 100644
--- a/drivers/char/tuner.c
+++ b/drivers/char/tuner.c
@@ -172,8 +172,7 @@ static void set_tv_freq(struct i2c_client *c, int freq)
config = tun->UHF;
#if 1 // Fix colorstandard mode change
- if (t->type == TUNER_PHILIPS_SECAM
- /*&& t->std == V4L2_STANDARD_DDD*/ )
+ if (t->type == TUNER_PHILIPS_SECAM && t->mode)
config |= tun->mode;
else
config &= ~tun->mode;