X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2Fscsi_ioctl.c;h=ffa3720e6ca05de7830a466664327deed289aa12;hb=bcf35afb528109a31264b45d4851fa6ae72dbe18;hp=9675b34638d4824b566e9df643042239bbf04e05;hpb=4486c5f510463673d2ea57b46137086f5b21ef36;p=mv-sheeva.git

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 9675b34638d..ffa3720e6ca 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -217,8 +217,6 @@ EXPORT_SYMBOL_GPL(blk_verify_command);
 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
 			     struct sg_io_hdr *hdr, int has_write_perm)
 {
-	memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
-
 	if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
 		return -EFAULT;
 	if (blk_verify_command(rq->cmd, has_write_perm))
@@ -529,8 +527,8 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
 	rq->cmd_type = REQ_TYPE_BLOCK_PC;
 	rq->data = NULL;
 	rq->data_len = 0;
+	rq->extra_len = 0;
 	rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
-	memset(rq->cmd, 0, sizeof(rq->cmd));
 	rq->cmd[0] = cmd;
 	rq->cmd[4] = data;
 	rq->cmd_len = 6;