From e215aa518faedd2f9bb7da961a308ce657ab818f Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 21 Jul 2011 13:16:05 -0500
Subject: [PATCH] --- yaml --- r: 261706 b: refs/heads/master c:
 fec62c368b9c8b05d5124ca6c3b8336b537f26f3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e9f997c058f..e50ec83a5d2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ead0bd175848729fc25415b840068e40b2998ad
+refs/heads/master: fec62c368b9c8b05d5124ca6c3b8336b537f26f3
diff --git a/trunk/drivers/scsi/hpsa.h b/trunk/drivers/scsi/hpsa.h
index 6d8dcd4dd06b..7f53ceaa7239 100644
--- a/trunk/drivers/scsi/hpsa.h
+++ b/trunk/drivers/scsi/hpsa.h
@@ -214,7 +214,7 @@ static void SA5_submit_command(struct ctlr_info *h,
 	dev_dbg(&h->pdev->dev, "Sending %x, tag = %x\n", c->busaddr,
 		c->Header.Tag.lower);
 	writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
-	(void) readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
+	(void) readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
 	h->commands_outstanding++;
 	if (h->commands_outstanding > h->max_outstanding)
 		h->max_outstanding = h->commands_outstanding;