From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 12 Apr 2010 08:35:30 +0000 (+0200)
Subject: firewire: ohci: prevent aliasing of locally handled register addresses
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=2608203daf5f87311c6e5d36e5de5efcb14aab24;p=linux-edison.git

firewire: ohci: prevent aliasing of locally handled register addresses

We must compute the offset from the CSR register base with the
full 48 address bits to prevent matching with addresses whose
lower 32 bits happen to be equal with one of the specially
handled registers.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index e33917bf97d..82fb2e7e99e 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1198,8 +1198,7 @@ static void handle_local_lock(struct fw_ohci *ohci,
 
 static void handle_local_request(struct context *ctx, struct fw_packet *packet)
 {
-	u64 offset;
-	u32 csr;
+	u64 offset, csr;
 
 	if (ctx == &ctx->ohci->at_request_ctx) {
 		packet->ack = ACK_PENDING;