---

yaml --- r: 127709 b: refs/heads/master c: 5c18c4d h: refs/heads/master i: 127707: 27b9036 v: v3
git-mirror · Jan 8, 2009 · 5a20da0 · 5a20da0
1 parent 447104f
commit 5a20da0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a7ba47fbc34a387e6347179ba571236596efbb
+refs/heads/master: 5c18c4d28ba9a29203c1dc6b7c64df63ca00938a
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
@@ -2001,6 +2001,10 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)
 	   as the caller should know this */
 	if (adev->link->ap->flags & ATA_FLAG_NO_IORDY)
 		return 0;
+	/* CF spec. r4.1 Table 22 says no iordy on PIO5 and PIO6.  */
+	if (ata_id_is_cfa(adev->id)
+	    && (adev->pio_mode == XFER_PIO_5 || adev->pio_mode == XFER_PIO_6))
+		return 0;
 	/* PIO3 and higher it is mandatory */
 	if (adev->pio_mode > XFER_PIO_2)
 		return 1;