summaryrefslogtreecommitdiff
path: root/drivers/scsi/arm/scsi.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-20 01:27:12 +0400
committerJeff Garzik <jeff@garzik.org>2006-08-20 01:27:12 +0400
commitd14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch)
treec4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /drivers/scsi/arm/scsi.h
parenta34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff)
parentef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff)
downloadlinux-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.tar.xz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/arm/scsi.h')
-rw-r--r--drivers/scsi/arm/scsi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
index 6dd544a5eb56..8c2600ffc6af 100644
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
@@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt)
unsigned long len = 0;
int buf;
- SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->buffer;
+ SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;
SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;
SCpnt->SCp.ptr = (char *)
(page_address(SCpnt->SCp.buffer->page) +