commit cbb59da719e413fcd499d86f49af2327893a9fdb
author Kristian Høgsberg <krh@redhat.com> Fri Feb 16 17:34:35 2007 -0500
committer Stefan Richter <stefanr@s5r6.in-berlin.de> Fri Mar 09 22:02:56 2007 +0100
tree 83aa1dd2d8aa4c7b17771e08e34c2d8d4aa905ee
parent 82eff9db7dc5d8f78898d5051975d14f48be2028

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>

drivers/firewire/fw-ohci.c

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 4512edb..4d54ebf 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1352,10 +1352,10 @@
 	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);