diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-19 10:21:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 16:35:51 -0400 |
commit | 201700d3544c653d453716a60976efe1987110af (patch) | |
tree | 8052fb09ac170b6de4b28737f89cb2621fac4fe7 /drivers/media/video/ivtv/ivtv-fileops.c | |
parent | fe06fe0a4d0f781f8ae0570e4d7e517a81878c1d (diff) |
V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-fileops.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index 489fbf25e723..8e97a938398f 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/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, | |||
218 | /* Process pending program info updates and pending VBI data */ | 218 | /* Process pending program info updates and pending VBI data */ |
219 | ivtv_update_pgm_info(itv); | 219 | ivtv_update_pgm_info(itv); |
220 | 220 | ||
221 | if (jiffies - itv->dualwatch_jiffies > HZ) { | 221 | if (jiffies - itv->dualwatch_jiffies > msecs_to_jiffies(1000)) { |
222 | itv->dualwatch_jiffies = jiffies; | 222 | itv->dualwatch_jiffies = jiffies; |
223 | ivtv_dualwatch(itv); | 223 | ivtv_dualwatch(itv); |
224 | } | 224 | } |
@@ -924,7 +924,7 @@ void ivtv_unmute(struct ivtv *itv) | |||
924 | if (atomic_read(&itv->capturing) == 0) | 924 | if (atomic_read(&itv->capturing) == 0) |
925 | ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0); | 925 | ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0); |
926 | 926 | ||
927 | ivtv_sleep_timeout(HZ / 10, 0); | 927 | ivtv_msleep_timeout(100, 0); |
928 | 928 | ||
929 | if (atomic_read(&itv->capturing)) { | 929 | if (atomic_read(&itv->capturing)) { |
930 | ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12); | 930 | ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12); |