libata passthru: always enforce correct DEV bit

 Always enforce correct DEV bit since we know which drive the command
is targeted. SAT demands to ignore the DEV bit, too.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 8c6a2b2e81b4..884f52f43f8f 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2595,12 +2595,10 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
                 tf->device = cdb[8];
                 tf->command = cdb[9];
         }
-        /*
-         * If slave is possible, enforce correct master/slave bit
-        */
-        if (qc->ap->flags & ATA_FLAG_SLAVE_POSS)
-                tf->device = qc->dev->devno ?
-                        tf->device | ATA_DEV1 : tf->device & ~ATA_DEV1;
+
+        /* enforce correct master/slave bit */
+        tf->device = dev->devno ?
+                tf->device | ATA_DEV1 : tf->device & ~ATA_DEV1;
 
         /* sanity check for pio multi commands */
         if ((cdb[1] & 0xe0) && !is_multi_taskfile(tf))