diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 05:48:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 05:48:06 +0100 |
| commit | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (patch) | |
| tree | 27a73405d3652dc6771fab28721b70e6d44ff47a /drivers/scsi/sg.c | |
| parent | [PATCH] mm/filemap.c:filemap_populate(): move export. (diff) | |
| parent | [CRYPTO] Check cra_alignmask against cra_blocksize (diff) | |
| download | linux-9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43.tar.xz linux-9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 2d30b46806bf..d86d5c26061d 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -49,6 +49,7 @@ static int sg_version_num = 30533; /* 2 digits for each component */ #include <linux/seq_file.h> #include <linux/blkdev.h> #include <linux/delay.h> +#include <linux/scatterlist.h> #include "scsi.h" #include <scsi/scsi_dbg.h> @@ -1996,9 +1997,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) if (!p) break; } - sclp->page = virt_to_page(p); - sclp->offset = offset_in_page(p); - sclp->length = ret_sz; + sg_set_buf(sclp, p, ret_sz); SCSI_LOG_TIMEOUT(5, printk("sg_build_build: k=%d, a=0x%p, len=%d\n", k, sg_scatg2virt(sclp), ret_sz)); |