merge by hand (scsi_device.h)
This commit is contained in:
@@ -298,7 +298,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
|
||||
{
|
||||
cmd->owner = SCSI_OWNER_MIDLEVEL;
|
||||
cmd->serial_number = 0;
|
||||
cmd->serial_number_at_timeout = 0;
|
||||
cmd->abort_reason = 0;
|
||||
|
||||
memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer);
|
||||
@@ -320,7 +319,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
|
||||
memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));
|
||||
cmd->buffer = cmd->request_buffer;
|
||||
cmd->bufflen = cmd->request_bufflen;
|
||||
cmd->internal_timeout = NORMAL_TIMEOUT;
|
||||
cmd->abort_reason = 0;
|
||||
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user