diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
commit | ab3b3fd38125be0242c2f94bf144b48054210882 (patch) | |
tree | c668c4d6381046f59a973284ff4de59436f84944 /drivers/scsi/esp.c | |
parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
download | op-kernel-dev-ab3b3fd38125be0242c2f94bf144b48054210882.zip op-kernel-dev-ab3b3fd38125be0242c2f94bf144b48054210882.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/esp.c')
-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; } |