summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 20:56:06 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 20:56:06 +0200
commitc56ec7639288f3e5d6371b0c48d37da93642fc93 (patch)
treed0b21507cd863a91528a556d8e1ea8f8679a8e90 /drivers
parentMerge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parent[BLOCK] blk_rq_map_sg() next_sg fixup (diff)
downloadlinux-c56ec7639288f3e5d6371b0c48d37da93642fc93.tar.xz
linux-c56ec7639288f3e5d6371b0c48d37da93642fc93.zip
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.c2
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)
if (unlikely(!sgl))
goto enomem;
+ memset(sgl, 0, sizeof(*sgl) * sgp->size);
+
/*
* first loop through, set initial index and return value
*/