Commit 6bc063d4 authored by David S. Miller's avatar David S. Miller

[SCSI] esp: Fix build.

The data_cmd[] member got deleted, so do not use it any more.  Scsi
commands do not have their ->cmd[] overwritten temporary to probe for
status after an error before retrying.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29ed4601
...@@ -2754,18 +2754,15 @@ static int esp_do_data_finale(struct esp *esp) ...@@ -2754,18 +2754,15 @@ static int esp_do_data_finale(struct esp *esp)
*/ */
static int esp_should_clear_sync(struct scsi_cmnd *sp) static int esp_should_clear_sync(struct scsi_cmnd *sp)
{ {
u8 cmd1 = sp->cmnd[0]; u8 cmd = sp->cmnd[0];
u8 cmd2 = sp->data_cmnd[0];
/* These cases are for spinning up a disk and /* These cases are for spinning up a disk and
* waiting for that spinup to complete. * waiting for that spinup to complete.
*/ */
if (cmd1 == START_STOP || if (cmd == START_STOP)
cmd2 == START_STOP)
return 0; return 0;
if (cmd1 == TEST_UNIT_READY || if (cmd == TEST_UNIT_READY)
cmd2 == TEST_UNIT_READY)
return 0; return 0;
/* One more special case for SCSI tape drives, /* One more special case for SCSI tape drives,
...@@ -2773,8 +2770,7 @@ static int esp_should_clear_sync(struct scsi_cmnd *sp) ...@@ -2773,8 +2770,7 @@ static int esp_should_clear_sync(struct scsi_cmnd *sp)
* completion of a rewind or tape load operation. * completion of a rewind or tape load operation.
*/ */
if (sp->device->type == TYPE_TAPE) { if (sp->device->type == TYPE_TAPE) {
if (cmd1 == MODE_SENSE || if (cmd == MODE_SENSE)
cmd2 == MODE_SENSE)
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment