forcedeth: multicast fix

[powerpc.git] / drivers / ieee1394 / ohci1394.c

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 5667c81..969de2a 100644 (file)
--- 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);
@@ -3537,7 +3541,5 @@ static int __init ohci1394_init(void)
        return pci_register_driver(&ohci1394_pci_driver);
 }
 
-/* Register before most other device drivers.
- * Useful for remote debugging via physical DMA, e.g. using firescope. */
-fs_initcall(ohci1394_init);
+module_init(ohci1394_init);
 module_exit(ohci1394_cleanup);