From ddb11437f7a98b22611610aacd224eda01f1b1b8 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Sun, 13 Nov 2005 16:22:06 -0500 Subject: [PATCH] --- yaml --- r: 14021 b: refs/heads/master c: dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 h: refs/heads/master i: 14019: c155205657108ce6b398d1e7330f29e4f99ab828 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-scsi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8f953d03c85e..59f0b2b8f7d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e12a1be6e8fa47ae6cdc4127a1b4640e19c288eb +refs/heads/master: dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c index 261be24e1df3..0df4b682965d 100644 --- a/trunk/drivers/scsi/libata-scsi.c +++ b/trunk/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,