From 59b4b9d6bfca3b1e1e482694bb4c676f1a74fdba Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 26 Oct 2007 17:47:34 +0100 Subject: [PATCH] --- yaml --- r: 72949 b: refs/heads/master c: 01c0ad58548fa1fa76379d1bea060f6e1d6ba2af h: refs/heads/master i: 72947: 78353ac61859ae5ec51e907c754569117830ebb2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/arm/scsi.h | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index be1f70d03723..aacbe74ebffb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b23e79fd87529706eb8e9e350226465b4abe70d2 +refs/heads/master: 01c0ad58548fa1fa76379d1bea060f6e1d6ba2af diff --git a/trunk/drivers/scsi/arm/scsi.h b/trunk/drivers/scsi/arm/scsi.h index 21ba57155bea..bb6550e31926 100644 --- a/trunk/drivers/scsi/arm/scsi.h +++ b/trunk/drivers/scsi/arm/scsi.h @@ -38,9 +38,7 @@ static inline int next_SCp(struct scsi_pointer *SCp) if (ret) { SCp->buffer++; SCp->buffers_residual--; - SCp->ptr = (char *) - (page_address(SCp->buffer->page) + - SCp->buffer->offset); + SCp->ptr = sg_virt(SCp->buffer); SCp->this_residual = SCp->buffer->length; } else { SCp->ptr = NULL; @@ -76,9 +74,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt) 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) + - SCpnt->SCp.buffer->offset); + SCpnt->SCp.ptr = sg_virt(SCpnt->SCp.buffer); SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; SCpnt->SCp.phase = SCpnt->request_bufflen;