diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 004062b5751e..9b0a3cba2b03 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -472,9 +472,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) | |||
472 | if (stat == (BUSY_STAT | READY_STAT)) | 472 | if (stat == (BUSY_STAT | READY_STAT)) |
473 | return 4; | 473 | return 4; |
474 | 474 | ||
475 | if ((rc == 1 && cmd == WIN_PIDENTIFY) && | 475 | if (rc == 1 && cmd == WIN_PIDENTIFY) { |
476 | ((drive->autotune == IDE_TUNE_DEFAULT) || | ||
477 | (drive->autotune == IDE_TUNE_AUTO))) { | ||
478 | printk(KERN_ERR "%s: no response (status = 0x%02x), " | 476 | printk(KERN_ERR "%s: no response (status = 0x%02x), " |
479 | "resetting drive\n", drive->name, stat); | 477 | "resetting drive\n", drive->name, stat); |
480 | msleep(50); | 478 | msleep(50); |
@@ -829,13 +827,9 @@ static void ide_port_tune_devices(ide_hwif_t *hwif) | |||
829 | ide_drive_t *drive = &hwif->drives[unit]; | 827 | ide_drive_t *drive = &hwif->drives[unit]; |
830 | 828 | ||
831 | if (drive->present) { | 829 | if (drive->present) { |
832 | if (drive->autotune == IDE_TUNE_AUTO) | 830 | if (drive->autotune) |
833 | ide_set_max_pio(drive); | 831 | ide_set_max_pio(drive); |
834 | 832 | ||
835 | if (drive->autotune != IDE_TUNE_DEFAULT && | ||
836 | drive->autotune != IDE_TUNE_AUTO) | ||
837 | continue; | ||
838 | |||
839 | drive->nice1 = 1; | 833 | drive->nice1 = 1; |
840 | 834 | ||
841 | if (hwif->dma_ops) | 835 | if (hwif->dma_ops) |