diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 16:58:53 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 16:58:53 +0100 |
| commit | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (patch) | |
| tree | 5ce615d345e720ddabf95c46fb62287ee763ad4e /drivers/scsi/libata-scsi.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Linux v2.6.15 (diff) | |
| download | linux-a18ceba7b40e24a9da87249bd74f16ea5abd6894.tar.xz linux-a18ceba7b40e24a9da87249bd74f16ea5abd6894.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index f286a6f1c0db..e0439be4b573 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2046,7 +2046,7 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc) else { u8 *scsicmd = cmd->cmnd; - if (scsicmd[0] == INQUIRY) { + if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) { u8 *buf = NULL; unsigned int buflen; @@ -2060,9 +2060,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc) * device. 2) Ensure response data format / ATAPI information * are always correct. */ - /* FIXME: do we ever override EVPD pages and the like, with - * this code? - */ if (buf[2] == 0) { buf[2] = 0x5; buf[3] = 0x32; |