[libata passthru] address slave devices correctly

dcc2d1e7 · Mark Lord · Jeff Garzik · e12a1be6 · dcc2d1e7
Commit dcc2d1e7 authored Nov 13, 2005 by Mark Lord Committed by Jeff Garzik Nov 13, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

drivers/scsi/libata-scsi.c drivers/scsi/libata-scsi.c +6 -0

No files found.
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2276,6 +2276,12 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
 		tf->device = scsicmd[8];
 		tf->command = scsicmd[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;

 	/*
 	 * Filter SET_FEATURES - XFER MODE command -- otherwise,