diff options
-rw-r--r-- | drivers/ide/ide-probe.c | 11 | ||||
-rw-r--r-- | drivers/ide/ide.c | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index cb158558d2012..2b8c8f86edbd0 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -862,6 +862,13 @@ static void probe_hwif(ide_hwif_t *hwif) drive->autotune == IDE_TUNE_AUTO) /* auto-tune PIO mode */ hwif->tuneproc(drive, 255); + + if (drive->autotune != IDE_TUNE_DEFAULT && + drive->autotune != IDE_TUNE_AUTO) + continue; + + drive->nice1 = 1; + /* * MAJOR HACK BARF :-/ * @@ -871,9 +878,7 @@ static void probe_hwif(ide_hwif_t *hwif) * Move here to prevent module loading clashing. */ // drive->autodma = hwif->autodma; - if ((hwif->ide_dma_check) && - ((drive->autotune == IDE_TUNE_DEFAULT) || - (drive->autotune == IDE_TUNE_AUTO))) { + if (hwif->ide_dma_check) { /* * Force DMAing for the beginning of the check. * Some chipsets appear to do interesting diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 20da2d61b200f..f1f1091894cc9 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -2038,7 +2038,6 @@ int ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver) (drive->autotune == IDE_TUNE_AUTO)) { /* DMA timings and setup moved to ide-probe.c */ drive->dsc_overlap = (drive->next != drive && driver->supports_dsc_overlap); - drive->nice1 = 1; } #ifdef CONFIG_PROC_FS if (drive->driver != &idedefault_driver) |