From d0206cc234ef0617b4b4e2d91cb4b274578c2d31 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 Jul 2008 20:33:37 +0200 Subject: [PATCH] --- yaml --- r: 102077 b: refs/heads/master c: cc57ccc03d2a9b5622300f4b59fc8b54408c6e24 h: refs/heads/master i: 102075: 46de734029f657f242d54d101d5e25b2bf3818b1 v: v3 --- [refs] | 2 +- trunk/drivers/ide/Kconfig | 1 + trunk/drivers/ide/legacy/ali14xx.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 786ecb5c42eb..bb93509adccb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f06ab3402aa2d6de060442c1053ea10b24b65076 +refs/heads/master: cc57ccc03d2a9b5622300f4b59fc8b54408c6e24 diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 994b6d39b559..e9afafd55cd0 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -981,6 +981,7 @@ config BLK_DEV_4DRIVES config BLK_DEV_ALI14XX tristate "ALI M14xx support" + select IDE_TIMINGS help This driver is enabled at runtime using the "ali14xx.probe" kernel boot parameter. It enables support for the secondary IDE interface diff --git a/trunk/drivers/ide/legacy/ali14xx.c b/trunk/drivers/ide/legacy/ali14xx.c index 052125fafcfa..4ec19737f3c5 100644 --- a/trunk/drivers/ide/legacy/ali14xx.c +++ b/trunk/drivers/ide/legacy/ali14xx.c @@ -117,10 +117,11 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) u8 param1, param2, param3, param4; unsigned long flags; int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50; + struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); /* calculate timing, according to PIO mode */ time1 = ide_pio_cycle_time(drive, pio); - time2 = ide_pio_timings[pio].active_time; + time2 = t->active; param3 = param1 = (time2 * bus_speed + 999) / 1000; param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1; if (pio < 3) {