diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-07-09 11:04:12 +0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 19:21:19 +0400 |
| commit | 53c91646f2661704ee95a0dd0a281ed543fd5fda (patch) | |
| tree | 3cf7f5e1ce1ca358d1eec5dff8c3f06713dd0954 | |
| parent | 97e5da43d6e99e44d25bed0bbdbb3444914f72a5 (diff) | |
| download | linux-53c91646f2661704ee95a0dd0a281ed543fd5fda.tar.xz | |
cciss: do not attempt to read from a write-only register
commit 07d0c38e7d84f911c72058a124c7f17b3c779a65 upstream.
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
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers/block/cciss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index 37a2d4fb01d8..759cbd9e917e 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -173,7 +173,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c) printk("Sending %x - down to controller\n", 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; |