diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-19 11:21:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-19 11:21:04 -0300 |
| commit | 2765fab4352a93fc144aa60c42abdbc9387bbf8e (patch) | |
| tree | aeaa55cdedf37489c67e299c1c63291b980749bf /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | 548a0e153cf92042c1392ca57c134cc1d49a83cd (diff) | |
| download | mediapointer-dvb-s2-2765fab4352a93fc144aa60c42abdbc9387bbf8e.tar.gz mediapointer-dvb-s2-2765fab4352a93fc144aa60c42abdbc9387bbf8e.tar.bz2 | |
Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index 489fbf25e..8e97a9383 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c @@ -218,7 +218,7 @@ static struct ivtv_buffer *ivtv_get_buffer(struct ivtv_stream *s, int non_block, /* Process pending program info updates and pending VBI data */ ivtv_update_pgm_info(itv); - if (jiffies - itv->dualwatch_jiffies > HZ) { + if (jiffies - itv->dualwatch_jiffies > msecs_to_jiffies(1000)) { itv->dualwatch_jiffies = jiffies; ivtv_dualwatch(itv); } @@ -924,7 +924,7 @@ void ivtv_unmute(struct ivtv *itv) if (atomic_read(&itv->capturing) == 0) ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0); - ivtv_sleep_timeout(HZ / 10, 0); + ivtv_msleep_timeout(100, 0); if (atomic_read(&itv->capturing)) { ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12); |