Skip to content

Commit

Permalink
V4L/DVB (5843): ivtv: fix missing signal_pending check.
Browse files Browse the repository at this point in the history
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent f885969 commit 90851fe
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/media/video/ivtv/ivtv-streams.c
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,6 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
then = jiffies;
/* Make sure DMA is complete */
add_wait_queue(&s->waitq, &wait);
set_current_state(TASK_INTERRUPTIBLE);
do {
/* check if DMA is pending */
if ((s->type == IVTV_ENC_STREAM_TYPE_MPG) && /* MPG Only */
Expand All @@ -822,9 +821,7 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
} else if (read_reg(IVTV_REG_DMASTATUS) & 0x02) {
break;
}

ivtv_sleep_timeout(HZ / 100, 1);
} while (then + HZ * 2 > jiffies);
} while (!ivtv_sleep_timeout(HZ / 100, 1) && then + HZ * 2 > jiffies);

set_current_state(TASK_RUNNING);
remove_wait_queue(&s->waitq, &wait);
Expand Down

0 comments on commit 90851fe

Please sign in to comment.