ieee1394: ohci1394: don't schedule IT tasklets on IR events

Bug noted by Pieter Palmers:  Isochronous transmit tasklets were
scheduled on isochronous receive events, in addition to the proper
isochronous receive tasklets.

http://marc.info/?l=linux1394-devel&m=119783196222802

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 372c5c16eb31..969de2a2d633 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -2126,10 +2126,14 @@ static void ohci_schedule_iso_tasklets(struct ti_ohci *ohci,
         list_for_each_entry(t, &ohci->iso_tasklet_list, link) {
                 mask = 1 << t->context;
 
-                if (t->type == OHCI_ISO_TRANSMIT && tx_event & mask)
-                        tasklet_schedule(&t->tasklet);
-                else if (rx_event & mask)
-                        tasklet_schedule(&t->tasklet);
+                if (t->type == OHCI_ISO_TRANSMIT) {
+                        if (tx_event & mask)
+                                tasklet_schedule(&t->tasklet);
+                } else {
+                        /* OHCI_ISO_RECEIVE or OHCI_ISO_MULTICHANNEL_RECEIVE */
+                        if (rx_event & mask)
+                                tasklet_schedule(&t->tasklet);
+                }
         }
 
         spin_unlock_irqrestore(&ohci->iso_tasklet_list_lock, flags);