Messages in this thread Patch in this message | | | Date | Fri, 05 Aug 2011 17:03:50 -0700 | From | Greg KH <> | Subject | [32/50] cciss: do not attempt to read from a write-only register |
| |
2.6.33-longterm review patch. If anyone has any objections, please let us know.
------------------
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
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>
--- drivers/block/cciss.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -181,7 +181,7 @@ static void SA5_submit_command( ctlr_inf 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;
| |