From e3f19298a417b6fa2dc4abb3fdb88f8816f850ae Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Thu, 7 Jun 2007 15:52:07 +0800 Subject: [PATCH] --- yaml --- r: 57557 b: refs/heads/master c: fa4453c4c94a61bbefe470b16ddbb6218481c6dc h: refs/heads/master i: 57555: c83f2f2cc93e0337879edfeb8eb1fa122cf093b7 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d293e93c77a7..212e6a2f2667 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23cb1d718ddbeb718ed7ca5be283dcbfb63993c3 +refs/heads/master: fa4453c4c94a61bbefe470b16ddbb6218481c6dc diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index 8c6a2b2e81b4..884f52f43f8f 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/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))