From: janitor@sternwelten.at
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/media/radio/radio-cadet.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/media/radio/radio-cadet.c~radio-radio-cadet-replace-schedule_timeout-with-msleep drivers/media/radio/radio-cadet.c
--- 25/drivers/media/radio/radio-cadet.c~radio-radio-cadet-replace-schedule_timeout-with-msleep 2004-09-02 15:31:22.025395624 -0700
+++ 25-akpm/drivers/media/radio/radio-cadet.c 2004-09-02 15:31:22.028395168 -0700
@@ -69,8 +69,7 @@ static int cadet_getrds(void)
outb(inb(io+1)&0x7f,io+1); /* Reset RDS detection */
spin_unlock(&cadet_io_lock);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
spin_lock(&cadet_io_lock);
outb(3,io); /* Select Decoder Control/Status */
@@ -243,8 +242,7 @@ static void cadet_setfreq(unsigned freq)
outb(curvol,io+1);
spin_unlock(&cadet_io_lock);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
cadet_gettune();
if((tunestat & 0x40) == 0) { /* Tuned */
_