Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[mirror_ubuntu-disco-kernel.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 7bfebd574e55d15dbd4e12f27a2c3a59675400b7..d359a715bbc88d2f71c499f7510a46b43f8bd6c3 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -433,11 +433,10 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q,
 
        bytes = max(in_len, out_len);
        if (bytes) {
-               buffer = kmalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
+               buffer = kzalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
                if (!buffer)
                        return -ENOMEM;
 
-               memset(buffer, 0, bytes);
        }
 
        rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);