firewire: Fix another typo from the bitfield conversion.
authorKristian Høgsberg <krh@redhat.com>
Fri, 16 Feb 2007 22:34:35 +0000 (17:34 -0500)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Fri, 9 Mar 2007 21:02:56 +0000 (22:02 +0100)
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/firewire/fw-ohci.c

index 4512edba6cb04981c715934a200bb0c8fc91ed0b..4d54ebf0b19299270ad74f4f819af33c81e5953a 100644 (file)
@@ -1352,10 +1352,10 @@ ohci_queue_iso(struct fw_iso_context *base,
        else
                irq = descriptor_no_irq;
 
-       last->control = cpu_to_le16(descriptor_output_last |
-                                   descriptor_status |
-                                   descriptor_branch_always |
-                                   irq);
+       last->control |= cpu_to_le16(descriptor_output_last |
+                                    descriptor_status |
+                                    descriptor_branch_always |
+                                    irq);
 
        dma_sync_single_for_device(ohci->card.device, ctx->buffer_bus,
                                   ISO_BUFFER_SIZE, DMA_TO_DEVICE);