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-04 21:58:38 -0700 |
| commit | 71e553ad4e5714309ccb6f9311fc1af3b0feaa6c (patch) | |
| tree | 188eb61152747dd53a617948f3000ada3fbb6a50 | |
| parent | f3783ea4c293f276d79166c92bfcc4592d518d63 (diff) | |
| download | kernel_samsung_aries-71e553ad4e5714309ccb6f9311fc1af3b0feaa6c.zip kernel_samsung_aries-71e553ad4e5714309ccb6f9311fc1af3b0feaa6c.tar.gz kernel_samsung_aries-71e553ad4e5714309ccb6f9311fc1af3b0feaa6c.tar.bz2 | |
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 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; |