diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 15:40:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 15:40:43 -0500 |
commit | cdcdb28623fb74d9564b102cd1cbe3854071e855 (patch) | |
tree | df9ce9bd9641236dd7a1ebf4c87854ccb62b7907 /drivers | |
parent | 10bb10dcb685cbe078e611f2dca3bd3e42fba0a8 (diff) | |
parent | fd71da468dd8897fe3f565dfd3743a87d8678e3a (diff) |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers')
-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 72ddba98f8f..2282c04fee4 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) | |||
2044 | else { | 2044 | else { |
2045 | u8 *scsicmd = cmd->cmnd; | 2045 | u8 *scsicmd = cmd->cmnd; |
2046 | 2046 | ||
2047 | if (scsicmd[0] == INQUIRY) { | 2047 | if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) { |
2048 | u8 *buf = NULL; | 2048 | u8 *buf = NULL; |
2049 | unsigned int buflen; | 2049 | unsigned int buflen; |
2050 | 2050 | ||
@@ -2058,9 +2058,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask) | |||
2058 | * device. 2) Ensure response data format / ATAPI information | 2058 | * device. 2) Ensure response data format / ATAPI information |
2059 | * are always correct. | 2059 | * are always correct. |
2060 | */ | 2060 | */ |
2061 | /* FIXME: do we ever override EVPD pages and the like, with | ||
2062 | * this code? | ||
2063 | */ | ||
2064 | if (buf[2] == 0) { | 2061 | if (buf[2] == 0) { |
2065 | buf[2] = 0x5; | 2062 | buf[2] = 0x5; |
2066 | buf[3] = 0x32; | 2063 | buf[3] = 0x32; |