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>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 097d6e9865bc..f073ea35da00 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -664,10 +664,11 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base)
                 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;