From 10de5357fe291d5d9b70fb420107be675abce581 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 Jul 2008 20:33:37 +0200 Subject: [PATCH] --- yaml --- r: 102079 b: refs/heads/master c: 2feecface7fd62be75bd4961324dc279a04bef22 h: refs/heads/master i: 102077: d0206cc234ef0617b4b4e2d91cb4b274578c2d31 102075: 46de734029f657f242d54d101d5e25b2bf3818b1 102071: 81c36d77b9116fb1d0dba1115495b1e80898e340 102063: bb2ecb427d4b623fe25b8a8ccc4fa6fe5bae0997 102047: 8bce2e79432c82a7f65261f23cf53f1d8afe3650 102015: 570ec4e5e75402811c7daa7907468aaac023e9cf v: v3 --- [refs] | 2 +- trunk/drivers/ide/Kconfig | 1 + trunk/drivers/ide/legacy/qd65xx.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ced4c0061279..acec0d83f998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b32b76f72df17de891181b47e714f9f897bb62a1 +refs/heads/master: 2feecface7fd62be75bd4961324dc279a04bef22 diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 615e0bc01844..86db707ad6cc 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -1011,6 +1011,7 @@ config BLK_DEV_HT6560B config BLK_DEV_QD65XX tristate "QDI QD65xx support" + select IDE_TIMINGS help This driver is enabled at runtime using the "qd65xx.probe" kernel boot parameter. It permits faster I/O speeds to be set. See the diff --git a/trunk/drivers/ide/legacy/qd65xx.c b/trunk/drivers/ide/legacy/qd65xx.c index 51dba82f8812..63f6c31d16ea 100644 --- a/trunk/drivers/ide/legacy/qd65xx.c +++ b/trunk/drivers/ide/legacy/qd65xx.c @@ -207,6 +207,7 @@ static void qd6500_set_pio_mode(ide_drive_t *drive, const u8 pio) static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio) { ide_hwif_t *hwif = drive->hwif; + struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); unsigned int cycle_time; int active_time = 175; int recovery_time = 415; /* worst case values from the dos driver */ @@ -236,7 +237,7 @@ static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio) active_time = 110; recovery_time = cycle_time - 120; } else { - active_time = ide_pio_timings[pio].active_time; + active_time = t->active; recovery_time = cycle_time - active_time; } }