From cbb59da719e413fcd499d86f49af2327893a9fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Fri, 16 Feb 2007 17:34:35 -0500
Subject: [PATCH] firewire: Fix another typo from the bitfield conversion.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/firewire/fw-ohci.c | 8 ++++----
 1 file 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,
 	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);
-- 
GitLab