diff options
-rw-r--r-- | drivers/ide/Kconfig | 1 | ||||
-rw-r--r-- | drivers/ide/legacy/ht6560b.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index e9afafd55cd0..615e0bc01844 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -1001,6 +1001,7 @@ config BLK_DEV_DTC2278 | |||
1001 | 1001 | ||
1002 | config BLK_DEV_HT6560B | 1002 | config BLK_DEV_HT6560B |
1003 | tristate "Holtek HT6560B support" | 1003 | tristate "Holtek HT6560B support" |
1004 | select IDE_TIMINGS | ||
1004 | help | 1005 | help |
1005 | This driver is enabled at runtime using the "ht6560b.probe" kernel | 1006 | This driver is enabled at runtime using the "ht6560b.probe" kernel |
1006 | boot parameter. It enables support for the secondary IDE interface | 1007 | boot parameter. It enables support for the secondary IDE interface |
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c index dd6dfb32e853..bd2f579946fa 100644 --- a/drivers/ide/legacy/ht6560b.c +++ b/drivers/ide/legacy/ht6560b.c | |||
@@ -216,6 +216,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio) | |||
216 | 216 | ||
217 | if (pio) { | 217 | if (pio) { |
218 | unsigned int cycle_time; | 218 | unsigned int cycle_time; |
219 | struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); | ||
219 | 220 | ||
220 | cycle_time = ide_pio_cycle_time(drive, pio); | 221 | cycle_time = ide_pio_cycle_time(drive, pio); |
221 | 222 | ||
@@ -224,10 +225,8 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio) | |||
224 | * actual cycle time for recovery and activity | 225 | * actual cycle time for recovery and activity |
225 | * according system bus speed. | 226 | * according system bus speed. |
226 | */ | 227 | */ |
227 | active_time = ide_pio_timings[pio].active_time; | 228 | active_time = t->active; |
228 | recovery_time = cycle_time | 229 | recovery_time = cycle_time - active_time - t->setup; |
229 | - active_time | ||
230 | - ide_pio_timings[pio].setup_time; | ||
231 | /* | 230 | /* |
232 | * Cycle times should be Vesa bus cycles | 231 | * Cycle times should be Vesa bus cycles |
233 | */ | 232 | */ |