diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:56:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:56:06 -0400 |
| commit | c56ec7639288f3e5d6371b0c48d37da93642fc93 (patch) | |
| tree | d0b21507cd863a91528a556d8e1ea8f8679a8e90 /drivers | |
| parent | fb9fc395174138983a49f2da982ed14caabbe741 (diff) | |
| parent | ba951841ceb7fa5b06ad48caa5270cc2ae17941e (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
[BLOCK] blk_rq_map_sg() next_sg fixup
Revert "[SCSI] Remove full sg table memset()"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 0c86be71bb33..aac8a02cbe80 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -764,6 +764,8 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask) | |||
| 764 | if (unlikely(!sgl)) | 764 | if (unlikely(!sgl)) |
| 765 | goto enomem; | 765 | goto enomem; |
| 766 | 766 | ||
| 767 | memset(sgl, 0, sizeof(*sgl) * sgp->size); | ||
| 768 | |||
| 767 | /* | 769 | /* |
| 768 | * first loop through, set initial index and return value | 770 | * first loop through, set initial index and return value |
| 769 | */ | 771 | */ |