Merge branch 'upstream'

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 745fc263feeb..c9c001490293 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2163,11 +2163,9 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
                 qc->tf.protocol = ATA_PROT_ATAPI_DMA;
                 qc->tf.feature |= ATAPI_PKT_DMA;
 
-#ifdef ATAPI_ENABLE_DMADIR
-                /* some SATA bridges need us to indicate data xfer direction */
-                if (cmd->sc_data_direction != DMA_TO_DEVICE)
+                if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))
+                        /* some SATA bridges need us to indicate data xfer direction */
                         qc->tf.feature |= ATAPI_DMADIR;
-#endif
         }
 
         qc->nbytes = cmd->bufflen;