diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-07-24 22:47:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-24 22:47:14 -0700 |
| commit | 6bc063d414a815937fc81449fa9ffe8d3a4cdf22 (patch) | |
| tree | 1a60ebf660b2d33918a3a73263fd248389db25f4 /drivers/scsi | |
| parent | 29ed46015dd61f99d203ec7ab307ccf92d2d0cf2 (diff) | |
| download | op-kernel-dev-6bc063d414a815937fc81449fa9ffe8d3a4cdf22.zip op-kernel-dev-6bc063d414a815937fc81449fa9ffe8d3a4cdf22.tar.gz | |
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/esp.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index eaf64c7..98bd227 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c @@ -2754,18 +2754,15 @@ static int esp_do_data_finale(struct esp *esp) */ static int esp_should_clear_sync(struct scsi_cmnd *sp) { - u8 cmd1 = sp->cmnd[0]; - u8 cmd2 = sp->data_cmnd[0]; + u8 cmd = sp->cmnd[0]; /* These cases are for spinning up a disk and * waiting for that spinup to complete. */ - if (cmd1 == START_STOP || - cmd2 == START_STOP) + if (cmd == START_STOP) return 0; - if (cmd1 == TEST_UNIT_READY || - cmd2 == TEST_UNIT_READY) + if (cmd == TEST_UNIT_READY) return 0; /* One more special case for SCSI tape drives, @@ -2773,8 +2770,7 @@ static int esp_should_clear_sync(struct scsi_cmnd *sp) * completion of a rewind or tape load operation. */ if (sp->device->type == TYPE_TAPE) { - if (cmd1 == MODE_SENSE || - cmd2 == MODE_SENSE) + if (cmd == MODE_SENSE) return 0; } |
