2 files changed, 8 insertions, 9 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index d45bbad9ffe7..d5cc96bb4298 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -267,18 +267,15 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
 {
         int pio_mode;
         int cycle_time = 0;
-        int use_iordy = 0;
         struct hd_driveid* id = drive->id;
         int overridden  = 0;
 
         if (mode_wanted != 255) {
                 pio_mode = mode_wanted;
-                use_iordy = (pio_mode > 2);
         } else if (!drive->id) {
                 pio_mode = 0;
         } else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {
                 printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name);
-                use_iordy = (pio_mode > 2);
         } else {
                 pio_mode = id->tPIO;
                 if (pio_mode > 2) {     /* 2 is maximum allowed tPIO value */
@@ -286,8 +283,7 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
                         overridden = 1;
                 }
                 if (id->field_valid & 2) {        /* drive implements ATA2? */
-                        if (id->capability & 8) { /* drive supports use_iordy? */
-                                use_iordy = 1;
+                        if (id->capability & 8) { /* IORDY supported? */
                                 cycle_time = id->eide_pio_iordy;
                                 if (id->eide_pio_modes & 7) {
                                         overridden = 0;
@@ -325,7 +321,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
         if (d) {
                 d->pio_mode = pio_mode;
                 d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time;
-                d->use_iordy = use_iordy;
         }
         return pio_mode;
 }
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index a7323d278c49..f2156ee7e2bd 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -52,9 +52,10 @@
  * Convert a PIO mode and cycle time to the required on/off times
  * for the interface.  This has protection against runaway timings.
  */
-static unsigned int get_pio_timings(ide_pio_data_t *p)
+static unsigned int get_pio_timings(ide_drive_t *drive, ide_pio_data_t *p)
 {
         unsigned int cmd_on, cmd_off;
+        u8 iordy = 0;
 
         cmd_on  = (ide_pio_timings[p->pio_mode].active_time + 29) / 30;
         cmd_off = (p->cycle_time - 30 * cmd_on + 29) / 30;
@@ -65,7 +66,10 @@ static unsigned int get_pio_timings(ide_pio_data_t *p)
         if (cmd_off == 0)
                 cmd_off = 1;
 
-        return (cmd_on - 1) << 8 | (cmd_off - 1) | (p->use_iordy ? 0x40 : 0x00);
+        if (p->pio_mode > 2 || ide_dev_has_iordy(drive->id))
+                iordy = 0x40;
+
+        return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
 }
 
 /*
@@ -82,7 +86,7 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
 
         pio = ide_get_best_pio_mode(drive, pio, 5, &p);
 
-        drv_ctrl = get_pio_timings(&p);
+        drv_ctrl = get_pio_timings(drive, &p);
 
         /*
          * Store the PIO timings so that we can restore them