diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 12:40:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 12:40:43 -0800 |
| commit | cdcdb28623fb74d9564b102cd1cbe3854071e855 (patch) | |
| tree | df9ce9bd9641236dd7a1ebf4c87854ccb62b7907 | |
| parent | 10bb10dcb685cbe078e611f2dca3bd3e42fba0a8 (diff) | |
| parent | fd71da468dd8897fe3f565dfd3743a87d8678e3a (diff) | |
| download | linux-cdcdb28623fb74d9564b102cd1cbe3854071e855.tar.gz linux-cdcdb28623fb74d9564b102cd1cbe3854071e855.tar.bz2 linux-cdcdb28623fb74d9564b102cd1cbe3854071e855.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| -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 72ddba98f8fb..2282c04fee46 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2044,7 +2044,7 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask) else { u8 *scsicmd = cmd->cmnd; - if (scsicmd[0] == INQUIRY) { + if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) { u8 *buf = NULL; unsigned int buflen; @@ -2058,9 +2058,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask) * 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; |