aboutsummaryrefslogtreecommitdiff
path: root/drivers/firewire/fw-ohci.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-16 17:34:35 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:02:56 +0100
commitcbb59da719e413fcd499d86f49af2327893a9fdb (patch)
tree83aa1dd2d8aa4c7b17771e08e34c2d8d4aa905ee /drivers/firewire/fw-ohci.c
parent82eff9db7dc5d8f78898d5051975d14f48be2028 (diff)
firewire: Fix another typo from the bitfield conversion.
Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
-rw-r--r--drivers/firewire/fw-ohci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 4512edba6cb..4d54ebf0b19 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -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);