From 02a78978cf8224df7884575c4e1fed886f2b1e7e Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Jan 2010 07:22:23 +0000 Subject: [PATCH] --- yaml --- r: 185813 b: refs/heads/master c: 040f6b4f14adb2ca5babb84e9fb2ebc6661e0be2 h: refs/heads/master i: 185811: a20e31e75182070b256ff11c40bb9552b525ac81 v: v3 --- [refs] | 2 +- trunk/drivers/ide/tx4938ide.c | 2 +- trunk/drivers/ide/tx4939ide.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ac55baaff95..e058b99958a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb430611930c526ff9bca991f254b259fc58ed3c +refs/heads/master: 040f6b4f14adb2ca5babb84e9fb2ebc6661e0be2 diff --git a/trunk/drivers/ide/tx4938ide.c b/trunk/drivers/ide/tx4938ide.c index 326d4683488b..1d80f1fdbc97 100644 --- a/trunk/drivers/ide/tx4938ide.c +++ b/trunk/drivers/ide/tx4938ide.c @@ -64,7 +64,7 @@ static void tx4938ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) pair = ide_get_pair_dev(drive); if (pair) - safe = min(safe, ide_get_best_pio_mode(pair, 255, 5)); + safe = min(safe, pair->pio_mode - XFER_PIO_0); tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, safe); } diff --git a/trunk/drivers/ide/tx4939ide.c b/trunk/drivers/ide/tx4939ide.c index f210633a3d57..3c7367751873 100644 --- a/trunk/drivers/ide/tx4939ide.c +++ b/trunk/drivers/ide/tx4939ide.c @@ -114,7 +114,7 @@ static void tx4939ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) pair = ide_get_pair_dev(drive); if (pair) - safe = min(safe, ide_get_best_pio_mode(pair, 255, 4)); + safe = min(safe, pair->pio_mode - XFER_PIO_0); /* * Update Command Transfer Mode for master/slave and Data * Transfer Mode for this drive.