Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...

[firefly-linux-kernel-4.4.55.git] / drivers / ide / tx4939ide.c

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index f210633a3d576fc0097ecbf5c94624f1c7b75d27..3c73677518733175d6497be954a72f4f08841e9b 100644 (file)
--- a/drivers/ide/tx4939ide.c
+++ b/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.