Skip to content

Commit

Permalink
ide: fix IDE_DFLAG_NO_IO_32BIT handling
Browse files Browse the repository at this point in the history
* IDE_DFLAG_NO_IO_32BIT may be set by cmd640's ->init_dev method
  so don't clear it in ide_port_tune_devices() (+ no need to do it).

* Move IDE_DFLAG_NO_IO_32BIT handling to ide_port_init_devices().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 24, 2009
1 parent 8e0ee43 commit 7610c4f
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,13 +848,6 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
ide_set_dma(drive);
}
}

ide_port_for_each_dev(i, drive, hwif) {
if (hwif->host_flags & IDE_HFLAG_NO_IO_32BIT)
drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
else
drive->dev_flags &= ~IDE_DFLAG_NO_IO_32BIT;
}
}

/*
Expand Down Expand Up @@ -1192,6 +1185,8 @@ static void ide_port_init_devices(ide_hwif_t *hwif)

if (hwif->host_flags & IDE_HFLAG_IO_32BIT)
drive->io_32bit = 1;
if (hwif->host_flags & IDE_HFLAG_NO_IO_32BIT)
drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
if (hwif->host_flags & IDE_HFLAG_UNMASK_IRQS)
drive->dev_flags |= IDE_DFLAG_UNMASK;
if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
Expand Down

0 comments on commit 7610c4f

Please sign in to comment.