---

yaml --- r: 21846 b: refs/heads/master c: 61eb066 h: refs/heads/master v: v3
git-mirror · Feb 12, 2006 · 2ab531e · 2ab531e
1 parent ce61b0f
commit 2ab531e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bd3300ac9158b6ceef38fab6fb473765a40e77e
+refs/heads/master: 61eb066affc02e16c548aef8b876c49c84113f40
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/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;