---

yaml --- r: 183163 b: refs/heads/master c: d62f557 h: refs/heads/master i: 183161: 4cb1897 183159: acdc042 v: v3
git-mirror · Mar 1, 2010 · 50f2be7 · 50f2be7
1 parent b7d1eb1
commit 50f2be7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2bd62207af4be8f5fe815ff90cc309056407829
+refs/heads/master: d62f5576efc4886c0f3633c2652c3a924e043be9
diff --git a/trunk/drivers/ata/pata_cmd64x.c b/trunk/drivers/ata/pata_cmd64x.c
@@ -131,8 +131,14 @@ static void cmd64x_set_timing(struct ata_port *ap, struct ata_device *adev, u8 m
 
 		if (pair) {
 			struct ata_timing tp;
+
 			ata_timing_compute(pair, pair->pio_mode, &tp, T, 0);
 			ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
+			if (pair->dma_mode) {
+				ata_timing_compute(pair, pair->dma_mode,
+						&tp, T, 0);
+				ata_timing_merge(&tp, &t, &t, ATA_TIMING_SETUP);
+			}
 		}
 	}