diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/tuner.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/tuner.c')
| -rw-r--r-- | drivers/char/tuner.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tuner.c b/drivers/char/tuner.c index c640ff321..7f7471e19 100644 --- a/drivers/char/tuner.c +++ b/drivers/char/tuner.c @@ -70,6 +70,8 @@ static struct tunertype tuners[] = { 16*157.25,16*463.25,0x02,0x04,0x01,0x8e,0xc2,732}, {"TEMIC PAL_I", TEMIC, PAL_I, 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,0xc2,623}, + {"Temic 4036 FY5 NTSC", TEMIC, NTSC, + 16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,0xc2,732}, }; /* ---------------------------------------------------------------------- */ @@ -142,8 +144,7 @@ static void set_radio_freq(struct tuner *t, int freq) if (debug) { UNLOCK_I2C_BUS(t->bus); current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + HZ/10; - schedule(); + schedule_timeout(HZ/10); LOCK_I2C_BUS(t->bus); if (tuner_islocked (t)) |