Merge branch 'upstream'

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 665ce382eb23..094c9c88a095 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -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;
 
@@ -2054,9 +2054,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;