Skip to content

Commit

Permalink
ieee1394: ohci1394: don't schedule IT tasklets on IR events
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Richter committed Jan 30, 2008
1 parent 4e6343a commit 85c5798
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 85c5798

Please sign in to comment.