lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream'

Browse Source
This commit is contained in:
Jeff Garzik
2006-01-03 10:59:55 -05:00
parent e7fb585940 a18ceba7b4
commit 02f693c711
257 changed files with 2323 additions and 2360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/libata-scsi.c
View File

@ -2040,7 +2040,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;
@ -2053,9 +2053,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc)
* to indicate to the Linux scsi midlayer this is a modern
* 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;