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:36:00 -0700 |
| commit | 27088fea257d6eb1a32ab58aae0a4ce5f712b300 (patch) | |
| tree | 0e18defd2d0b63b008f96aa2291fac39622545c3 | |
| parent | eed4a1ebe22299f6120d3ca267bb21585be73703 (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>
| -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 b8901fff9f8c..658b6174b440 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -181,7 +181,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; |