diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-10-24 08:55:40 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-24 08:55:40 +0200 |
| commit | 5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339 (patch) | |
| tree | d74678bcbf7b5386b06e0e3b6676f0f6e471e00f /drivers/scsi/atari_NCR5380.c | |
| parent | d91c5e8839791b27672277e81451873499bc517e (diff) | |
| download | linux-5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339.tar.gz linux-5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339.tar.bz2 linux-5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339.zip | |
m68k: sg fallout
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jens Axboe <axboe@carl.home.kernel.dk>
Diffstat (limited to 'drivers/scsi/atari_NCR5380.c')
| -rw-r--r-- | drivers/scsi/atari_NCR5380.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index d1780980fb20..a9680b5e8ac6 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c @@ -477,10 +477,9 @@ static void merge_contiguous_buffers(Scsi_Cmnd *cmd) for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1; cmd->SCp.buffers_residual && - virt_to_phys(page_address(cmd->SCp.buffer[1].page) + - cmd->SCp.buffer[1].offset) == endaddr;) { + virt_to_phys(sg_virt(&cmd->SCp.buffer[1])) == endaddr;) { MER_PRINTK("VTOP(%p) == %08lx -> merging\n", - page_address(cmd->SCp.buffer[1].page), endaddr); + page_address(sg_page(&cmd->SCp.buffer[1])), endaddr); #if (NDEBUG & NDEBUG_MERGING) ++cnt; #endif |