From 85a7251011be1900cf5865a84b040d0d0a909a7c Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Sat, 8 Mar 2008 13:18:58 -0500 Subject: [PATCH] --- yaml --- r: 89643 b: refs/heads/master c: 15f0d833f63da2fa49aed81480a37d5e896b5b9b h: refs/heads/master i: 89641: 504f7c5633d8ae9fbc76c64c1f388fccc4259084 89639: eff98deac839d21524c33fdbe4fa86fe1f48bdde v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-transaction.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abbd050a989b..006b94aa50a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cca6097713c62eac43aef27b31e7f1553dde4f94 +refs/heads/master: 15f0d833f63da2fa49aed81480a37d5e896b5b9b diff --git a/trunk/drivers/firewire/fw-transaction.c b/trunk/drivers/firewire/fw-transaction.c index 47bfe761250f..3682e75a09e1 100644 --- a/trunk/drivers/firewire/fw-transaction.c +++ b/trunk/drivers/firewire/fw-transaction.c @@ -797,7 +797,7 @@ handle_registers(struct fw_card *card, struct fw_request *request, unsigned long long offset, void *payload, size_t length, void *callback_data) { - int reg = offset - CSR_REGISTER_BASE; + int reg = offset & ~CSR_REGISTER_BASE; unsigned long long bus_time; __be32 *data = payload;