From 05f824d5cc0b78d64617a6a28b5826b5c20d6f75 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Feb 2013 12:39:44 +0100 Subject: [PATCH] --- yaml --- r: 360267 b: refs/heads/master c: 98f99a8ac8d92fef74b61e8dd25df934afbbf843 h: refs/heads/master i: 360265: cca467c79469086011b65963f003ef5170fb25b3 360263: 56cdb52c28a4155165a33d15ffccf12326e8d754 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aacraid/src.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98975f7087bd..688fd1b761f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcc48ffa4beb0db52bdca42dc3e5ce765c2ed8b5 +refs/heads/master: 98f99a8ac8d92fef74b61e8dd25df934afbbf843 diff --git a/trunk/drivers/scsi/aacraid/src.c b/trunk/drivers/scsi/aacraid/src.c index 3b021ec63255..e2e349204e7d 100644 --- a/trunk/drivers/scsi/aacraid/src.c +++ b/trunk/drivers/scsi/aacraid/src.c @@ -407,7 +407,7 @@ static int aac_src_deliver_message(struct fib *fib) fib->hw_fib_va->header.StructType = FIB_MAGIC2; fib->hw_fib_va->header.SenderFibAddress = (u32)address; fib->hw_fib_va->header.u.TimeStamp = 0; - BUG_ON((u32)(address >> 32) != 0L); + BUG_ON(upper_32_bits(address) != 0L); address |= fibsize; } else { /* Calculate the amount to the fibsize bits */ @@ -431,7 +431,7 @@ static int aac_src_deliver_message(struct fib *fib) address |= fibsize; } - src_writel(dev, MUnit.IQ_H, (address >> 32) & 0xffffffff); + src_writel(dev, MUnit.IQ_H, upper_32_bits(address) & 0xffffffff); src_writel(dev, MUnit.IQ_L, address & 0xffffffff); return 0;