From: Stephen M. Cameron Date: Sat, 9 Jul 2011 07:04:12 +0000 (+0200) Subject: cciss: do not attempt to read from a write-only register X-Git-Tag: upstream/snapshot3+hdmi~9559^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07d0c38e7d84f911c72058a124c7f17b3c779a65;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git cciss: do not attempt to read from a write-only register Most smartarrays will tolerate it, but some new ones don't. Signed-off-by: Stephen M. Cameron Note: this is a regression caused by commit 1ddd5049 Cc: stable@kernel.org Signed-off-by: Jens Axboe --- 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;