From 50f2be7aadb5e6fc697e7762d71898ca940a78a6 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Jan 2010 18:15:04 +0100 Subject: [PATCH] --- yaml --- r: 183163 b: refs/heads/master c: d62f5576efc4886c0f3633c2652c3a924e043be9 h: refs/heads/master i: 183161: 4cb189793cd1bfbfa5812e8656341f1f06405c5e 183159: acdc0421e2ce63811bb115c4298effce659cc7df v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_cmd64x.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8bea3cdb98d5..da7f94623047 100644 --- 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 index db08c9d1a333..0235a1d3c2fb 100644 --- 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); + } } }