lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../scsi-rc-fixes-2.6

Browse Source
This commit is contained in:
James Bottomley
2006-11-22 12:06:44 -06:00
parent e138a5d235 f26b90440c
commit 0bd2af4683
1886 changed files with 57084 additions and 18671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/scsi_lib.c
View File

@@ -410,6 +410,7 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
goto free_req;
req->cmd_len = cmd_len;
memset(req->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
memcpy(req->cmd, cmd, req->cmd_len);
req->sense = sioc->sense;
req->sense_len = 0;
@@ -1119,7 +1120,7 @@ static int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
req->buffer = NULL;
}
BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
BUILD_BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
cmd->cmd_len = req->cmd_len;
if (!req->data_len)