diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-05 08:42:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-05 08:42:18 -0300 |
| commit | b6d0c4b9b47910a71f4fcec532cd503f319da0d8 (patch) | |
| tree | 5fdbc6612d7ba83dbcb34585472832ae1bd05e8f /linux/drivers/media/video/ivtv/ivtv-yuv.c | |
| parent | 3d2b4c935e8804f2ed232614079f41ab6360aad2 (diff) | |
| parent | a98b15d8435d3661c93a5e73eca17f300508a11c (diff) | |
| download | mediapointer-dvb-s2-b6d0c4b9b47910a71f4fcec532cd503f319da0d8.tar.gz mediapointer-dvb-s2-b6d0c4b9b47910a71f4fcec532cd503f319da0d8.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb/rev/da67609aae86
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-yuv.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-yuv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.c b/linux/drivers/media/video/ivtv/ivtv-yuv.c index 7912ed6b7..c0875378a 100644 --- a/linux/drivers/media/video/ivtv/ivtv-yuv.c +++ b/linux/drivers/media/video/ivtv/ivtv-yuv.c @@ -1063,7 +1063,8 @@ static int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args) prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); /* if no UDMA is pending and no UDMA is in progress, then the DMA is finished */ - while (itv->i_flags & (IVTV_F_I_UDMA_PENDING | IVTV_F_I_UDMA)) { + while (test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags) || + test_bit(IVTV_F_I_UDMA, &itv->i_flags)) { /* don't interrupt if the DMA is in progress but break off a still pending DMA. */ got_sig = signal_pending(current); |