From: Tejun Heo <htejun@gmail.com>
Date: Sun, 12 Feb 2006 14:22:37 +0000 (+0900)
Subject: [PATCH] libata: don't do EDD handling if ->probe_reset is used
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61eb066affc02e16c548aef8b876c49c84113f40;p=linux-beck.git

[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>
---

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a0b6ca3d1a0c..21ae752cd95c 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;