Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / qd65xx.c

diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index d1414a75b52371d707aa5375ec5ee4b1221e2ca5..7783745dd167de3cf39f7f7d9dee2b55c80964c3 100644 (file)
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -258,8 +258,7 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
        int recovery_time = 415; /* worst case values from the dos driver */
 
        if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
-               pio = ide_get_best_pio_mode(drive, pio, 255, &d);
-               pio = min_t(u8, pio, 4);
+               pio = ide_get_best_pio_mode(drive, pio, 4, &d);
 
                switch (pio) {
                        case 0: break;