diff options
Diffstat (limited to 'drivers/ide/ide-proc.c')
-rw-r--r-- | drivers/ide/ide-proc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index e7030a491463..b26926487cc0 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
@@ -227,7 +227,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg) | |||
227 | 227 | ||
228 | ide_devset_rw(current_speed, xfer_rate); | 228 | ide_devset_rw(current_speed, xfer_rate); |
229 | ide_devset_rw_field(init_speed, init_speed); | 229 | ide_devset_rw_field(init_speed, init_speed); |
230 | ide_devset_rw_field(nice1, nice1); | 230 | ide_devset_rw_flag(nice1, IDE_DFLAG_NICE1); |
231 | ide_devset_rw_field(number, dn); | 231 | ide_devset_rw_field(number, dn); |
232 | 232 | ||
233 | static const struct ide_proc_devset ide_generic_settings[] = { | 233 | static const struct ide_proc_devset ide_generic_settings[] = { |
@@ -622,9 +622,7 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif) | |||
622 | for (d = 0; d < MAX_DRIVES; d++) { | 622 | for (d = 0; d < MAX_DRIVES; d++) { |
623 | ide_drive_t *drive = &hwif->drives[d]; | 623 | ide_drive_t *drive = &hwif->drives[d]; |
624 | 624 | ||
625 | if (!drive->present) | 625 | if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0 || drive->proc) |
626 | continue; | ||
627 | if (drive->proc) | ||
628 | continue; | 626 | continue; |
629 | 627 | ||
630 | drive->proc = proc_mkdir(drive->name, parent); | 628 | drive->proc = proc_mkdir(drive->name, parent); |