Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=33bc4dea0ece371ccadbac8bf90fd0b8e2803f06
Commit:     33bc4dea0ece371ccadbac8bf90fd0b8e2803f06
Parent:     b1139e353c7fc636bfe413f3296ba0284eb60c2e
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 18 11:36:09 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:05:27 2007 -0300

    V4L/DVB (6043): ivtv: fix incorrect round-robin implementation
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/ivtv/ivtv-irq.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-irq.c 
b/drivers/media/video/ivtv/ivtv-irq.c
index 88c6f4f..a97d55f 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -859,8 +859,9 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
        }
 
        if ((combo & IVTV_IRQ_DMA) && !test_bit(IVTV_F_I_DMA, &itv->i_flags)) {
+               itv->irq_rr_idx++;
                for (i = 0; i < IVTV_MAX_STREAMS; i++) {
-                       int idx = (i + itv->irq_rr_idx++) % IVTV_MAX_STREAMS;
+                       int idx = (i + itv->irq_rr_idx) % IVTV_MAX_STREAMS;
                        struct ivtv_stream *s = &itv->streams[idx];
 
                        if (!test_and_clear_bit(IVTV_F_S_DMA_PENDING, 
&s->s_flags))
@@ -877,8 +878,9 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
        }
 
        if ((combo & IVTV_IRQ_DMA) && !test_bit(IVTV_F_I_PIO, &itv->i_flags)) {
+               itv->irq_rr_idx++;
                for (i = 0; i < IVTV_MAX_STREAMS; i++) {
-                       int idx = (i + itv->irq_rr_idx++) % IVTV_MAX_STREAMS;
+                       int idx = (i + itv->irq_rr_idx) % IVTV_MAX_STREAMS;
                        struct ivtv_stream *s = &itv->streams[idx];
 
                        if (!test_and_clear_bit(IVTV_F_S_PIO_PENDING, 
&s->s_flags))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to