Give the udma_filter() method call taking precedence over using the mode masks. Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> --- Posting this change separately as have been asked. Should apply to the current Linus' tree... drivers/ide/ide-dma.c | 7 +++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: linux-2.6/drivers/ide/ide-dma.c =================================================================== --- linux-2.6.orig/drivers/ide/ide-dma.c +++ linux-2.6/drivers/ide/ide-dma.c @@ -664,10 +664,11 @@ static unsigned int ide_get_mode_mask(id if ((id->field_valid & 4) == 0) break; - mask = id->dma_ultra & hwif->ultra_mask; - 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)) mask &= 0x07; - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
