diff options
author | Kristian Høgsberg <krh@redhat.com> | 2007-02-16 17:34:35 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 16:02:56 -0500 |
commit | cbb59da719e413fcd499d86f49af2327893a9fdb (patch) | |
tree | 83aa1dd2d8aa4c7b17771e08e34c2d8d4aa905ee /drivers/firewire | |
parent | 82eff9db7dc5d8f78898d5051975d14f48be2028 (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')
-rw-r--r-- | drivers/firewire/fw-ohci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 4512edba6cb0..4d54ebf0b192 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, | |||
1352 | else | 1352 | else |
1353 | irq = descriptor_no_irq; | 1353 | irq = descriptor_no_irq; |
1354 | 1354 | ||
1355 | last->control = cpu_to_le16(descriptor_output_last | | 1355 | last->control |= cpu_to_le16(descriptor_output_last | |
1356 | descriptor_status | | 1356 | descriptor_status | |
1357 | descriptor_branch_always | | 1357 | descriptor_branch_always | |
1358 | irq); | 1358 | irq); |
1359 | 1359 | ||
1360 | dma_sync_single_for_device(ohci->card.device, ctx->buffer_bus, | 1360 | dma_sync_single_for_device(ohci->card.device, ctx->buffer_bus, |
1361 | ISO_BUFFER_SIZE, DMA_TO_DEVICE); | 1361 | ISO_BUFFER_SIZE, DMA_TO_DEVICE); |