From 5b7d65e602e5ea6bc3c9a22c550d5421f9e77b83 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 17 Jul 2007 16:15:58 -0300 Subject: [PATCH] --- yaml --- r: 62273 b: refs/heads/master c: a2d66a37c743ba201e85c93c4ec29d58ca94b728 h: refs/heads/master i: 62271: 71ea3c3095cc476376177c3dbfe7dacc84502863 v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-aimslab.c | 2 +- trunk/drivers/media/radio/radio-cadet.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a33b60e06809..ba65a1280ba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7809b4cba2bc0165c804ab4eaf10308aad14fc8e +refs/heads/master: a2d66a37c743ba201e85c93c4ec29d58ca94b728 diff --git a/trunk/drivers/media/radio/radio-aimslab.c b/trunk/drivers/media/radio/radio-aimslab.c index ce940b1b787f..f0a67e93d7fd 100644 --- a/trunk/drivers/media/radio/radio-aimslab.c +++ b/trunk/drivers/media/radio/radio-aimslab.c @@ -63,7 +63,7 @@ struct rt_device static void sleep_delay(long n) { /* Sleep nicely for 'n' uS */ - int d=n/(1000000/HZ); + int d=n/msecs_to_jiffies(1000); if(!d) udelay(n); else diff --git a/trunk/drivers/media/radio/radio-cadet.c b/trunk/drivers/media/radio/radio-cadet.c index 8cf2e9df5c8a..34e317ced5a3 100644 --- a/trunk/drivers/media/radio/radio-cadet.c +++ b/trunk/drivers/media/radio/radio-cadet.c @@ -329,7 +329,7 @@ cadet_handler(unsigned long data) init_timer(&readtimer); readtimer.function=cadet_handler; readtimer.data=(unsigned long)0; - readtimer.expires=jiffies+(HZ/20); + readtimer.expires=jiffies+msecs_to_jiffies(50); add_timer(&readtimer); } @@ -349,7 +349,7 @@ cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos) init_timer(&readtimer); readtimer.function=cadet_handler; readtimer.data=(unsigned long)0; - readtimer.expires=jiffies+(HZ/20); + readtimer.expires=jiffies+msecs_to_jiffies(50); add_timer(&readtimer); } if(rdsin==rdsout) {