diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 07:22:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 07:22:36 -0700 |
| commit | dab5025ca2f704ea6629121446d62e3043b210e9 (patch) | |
| tree | e00007494171934393ab500bce506b03777486c0 /drivers | |
| parent | 761a126017e3f001d3f5a574787aa232a9cd5bb5 (diff) | |
| parent | 6bc063d414a815937fc81449fa9ffe8d3a4cdf22 (diff) | |
| download | linux-3.10-dab5025ca2f704ea6629121446d62e3043b210e9.tar.gz linux-3.10-dab5025ca2f704ea6629121446d62e3043b210e9.tar.bz2 linux-3.10-dab5025ca2f704ea6629121446d62e3043b210e9.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI] esp: Fix build.
[SPARC]: Fix SA_STATIC_ALLOC value.
[SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.
Diffstat (limited to 'drivers')
| -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 eaf64c7e54e..98bd22714d0 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; } |