diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-07-09 09:04:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 10:23:12 -0700 |
| commit | 78a4ddf99d27b83ca7b9720338b1030206db4a0e (patch) | |
| tree | 457bba98a8b1711fcd6aeafc009131941c5ef68e /drivers | |
| parent | 330091175005731845c82ae2b44ac72a93902a25 (diff) | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 5ae1b1c4fc44..04d6bf81ccdc 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -165,7 +165,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; |