1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index df29868209f3..92a6c7bcf527 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -291,11 +291,11 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
         struct hd_driveid* id = drive->id;
         int overridden  = 0;
 
-        if (mode_wanted != 255) {
-                pio_mode = mode_wanted;
-        } else if (!drive->id) {
-                pio_mode = 0;
-        } else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {
+        if (mode_wanted != 255)
+                return min_t(u8, mode_wanted, max_mode);
+
+        if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_BLACKLIST) == 0 &&
+            (pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {
                 printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name);
         } else {
                 pio_mode = id->tPIO;
@@ -324,7 +324,8 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
                 /*
                  * Conservative "downgrade" for all pre-ATA2 drives
                  */
-                if (pio_mode && pio_mode < 4) {
+                if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_DOWNGRADE) == 0 &&
+                    pio_mode && pio_mode < 4) {
                         pio_mode--;
                         printk(KERN_INFO "%s: applying conservative "
                                          "PIO \"downgrade\"\n", drive->name);