|
@@ -2152,29 +2152,23 @@ static int esp_do_data_finale(struct NCR_ESP *esp,
|
|
|
*/
|
|
|
static int esp_should_clear_sync(Scsi_Cmnd *sp)
|
|
|
{
|
|
|
- unchar cmd1 = sp->cmnd[0];
|
|
|
- unchar cmd2 = sp->data_cmnd[0];
|
|
|
+ unchar 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,
|
|
|
* this is what is used to probe the device for
|
|
|
* completion of a rewind or tape load operation.
|
|
|
*/
|
|
|
- if(sp->device->type == TYPE_TAPE) {
|
|
|
- if(cmd1 == MODE_SENSE ||
|
|
|
- cmd2 == MODE_SENSE)
|
|
|
- return 0;
|
|
|
- }
|
|
|
+ if(sp->device->type == TYPE_TAPE && cmd == MODE_SENSE)
|
|
|
+ return 0;
|
|
|
|
|
|
return 1;
|
|
|
}
|