From: Kristian Høgsberg <krh@redhat.com>
Date: Fri, 16 Feb 2007 22:34:35 +0000 (-0500)
Subject: firewire: Fix another typo from the bitfield conversion.
X-Git-Tag: v2.6.22-rc1~111^2~91
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbb59da719e413fcd499d86f49af2327893a9fdb;p=linux-2.6

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>
---

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 4512edba6c..4d54ebf0b1 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);