ide: call udma_filter() before resorting to the UltraDMA mask
Give the udma_filter() method call precedence over using the mode masks. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
bda7970c27
commit
851dd33bcf
|
@ -664,10 +664,11 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base)
|
||||||
if ((id->field_valid & 4) == 0)
|
if ((id->field_valid & 4) == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
mask = id->dma_ultra & hwif->ultra_mask;
|
|
||||||
|
|
||||||
if (hwif->udma_filter)
|
if (hwif->udma_filter)
|
||||||
mask &= hwif->udma_filter(drive);
|
mask = hwif->udma_filter(drive);
|
||||||
|
else
|
||||||
|
mask = hwif->ultra_mask;
|
||||||
|
mask &= id->dma_ultra;
|
||||||
|
|
||||||
if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
|
if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
|
||||||
mask &= 0x07;
|
mask &= 0x07;
|
||||||
|
|
Loading…
Reference in a new issue