UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

This commit is contained in:
Linus Torvalds 2005-12-24 12:40:43 -08:00
parent 10bb10dcb6 fd71da468d
commit cdcdb28623
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2044,7 +2044,7 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
else { else {
u8 *scsicmd = cmd->cmnd; u8 *scsicmd = cmd->cmnd;
if (scsicmd[0] == INQUIRY) { if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) {
u8 *buf = NULL; u8 *buf = NULL;
unsigned int buflen; unsigned int buflen;
@ -2057,9 +2057,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
* to indicate to the Linux scsi midlayer this is a modern * to indicate to the Linux scsi midlayer this is a modern
* device. 2) Ensure response data format / ATAPI information * device. 2) Ensure response data format / ATAPI information
* are always correct. * are always correct.
*/
/* FIXME: do we ever override EVPD pages and the like, with
* this code?
*/ */
if (buf[2] == 0) { if (buf[2] == 0) {
buf[2] = 0x5; buf[2] = 0x5;