Commit 851dd33b authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bda7970c

drivers/ide/ide-dma.c

+4 −3
Original line number Diff line number Diff line
@@ -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;