From f6f52d7b9212766267679dbbdd8255cde9406f07 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 6 Jan 2009 17:20:55 +0100 Subject: [PATCH] --- yaml --- r: 126441 b: refs/heads/master c: 5d44a1502ff711bea2a9b2bf2fbd2503081cf3be h: refs/heads/master i: 126439: ec8eb0321d5a82f3cbfc814faeb52025fe2979f8 v: v3 --- [refs] | 2 +- trunk/drivers/ide/cmd64x.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5a7dd4d7043e..d3f4f2509945 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b78ff52354b7271b9221ca2c14c54f627c649fa +refs/heads/master: 5d44a1502ff711bea2a9b2bf2fbd2503081cf3be diff --git a/trunk/drivers/ide/cmd64x.c b/trunk/drivers/ide/cmd64x.c index d1fc198719b2..265cf9268c63 100644 --- a/trunk/drivers/ide/cmd64x.c +++ b/trunk/drivers/ide/cmd64x.c @@ -138,10 +138,12 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio) * the slowest address setup timing ourselves. */ if (hwif->channel) { - ide_drive_t *drives = hwif->drives; + ide_drive_t *pair = ide_get_pair_dev(drive); drive->drive_data = setup_count; - setup_count = max(drives[0].drive_data, drives[1].drive_data); + + if (pair) + setup_count = max_t(u8, setup_count, pair->drive_data); } if (setup_count > 5) /* shouldn't actually happen... */