aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-02-12 23:22:37 +0900
committerJeff Garzik <jgarzik@pobox.com>2006-02-12 14:29:10 -0500
commit61eb066affc02e16c548aef8b876c49c84113f40 (patch)
treea7e3b690dbedd5f9007a64d95ae85d6019b48978
parent0bd3300ac9158b6ceef38fab6fb473765a40e77e (diff)
[PATCH] libata: don't do EDD handling if ->probe_reset is used
EDD is never used with ->probe_reset. Don't handle EDD special case in ata_dev_identify if ->probe_reset is in use. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/scsi/libata-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a0b6ca3d1a0..21ae752cd95 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -939,7 +939,8 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
return;
}
- if (ap->flags & (ATA_FLAG_SRST | ATA_FLAG_SATA_RESET))
+ if (ap->ops->probe_reset ||
+ ap->flags & (ATA_FLAG_SRST | ATA_FLAG_SATA_RESET))
using_edd = 0;
else
using_edd = 1;