summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2011-07-09 09:04:12 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-07-09 09:04:12 +0200
commit07d0c38e7d84f911c72058a124c7f17b3c779a65 (patch)
treed9a63809a1d67e5410ff5cf76a43fb6899d0c281 /drivers/block
parenta7e9357f10744c3392ce3cd735c690ee513c7375 (diff)
downloadop-kernel-dev-07d0c38e7d84f911c72058a124c7f17b3c779a65.zip
op-kernel-dev-07d0c38e7d84f911c72058a124c7f17b3c779a65.tar.gz
cciss: do not attempt to read from a write-only register
Most smartarrays will tolerate it, but some new ones don't. Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Note: this is a regression caused by commit 1ddd5049 Cc: stable@kernel.org Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 16b4d58..c049548 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -223,7 +223,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c)
h->ctlr, c->busaddr);
#endif /* CCISS_DEBUG */
writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
- readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
+ readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
h->commands_outstanding++;
if ( h->commands_outstanding > h->max_outstanding)
h->max_outstanding = h->commands_outstanding;
OpenPOWER on IntegriCloud