Gitweb: http://git.kernel.org/linus/2608203daf5f87311c6e5d36e5de5efcb14aab24 Commit: 2608203daf5f87311c6e5d36e5de5efcb14aab24 Parent: d6372b6e7c6142e6cc2108b3b850584cd7ade106 Author: Clemens Ladisch <clemens@ladisch.de> AuthorDate: Mon Apr 12 10:35:30 2010 +0200 Committer: Stefan Richter <stefanr@s5r6.in-berlin.de> CommitDate: Mon Apr 19 19:58:32 2010 +0200 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> --- drivers/firewire/ohci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index e33917b..82fb2e7 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; -- To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
