From: Andrew Morton <akpm@osdl.org>

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ide/ide-lib.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -puN drivers/ide/ide-lib.c~ide_dma_speed-fixes-warning-fix drivers/ide/ide-lib.c
--- devel/drivers/ide/ide-lib.c~ide_dma_speed-fixes-warning-fix	2006-05-15 08:03:45.000000000 -0700
+++ devel-akpm/drivers/ide/ide-lib.c	2006-05-15 08:04:08.000000000 -0700
@@ -90,9 +90,9 @@ u8 ide_dma_speed(ide_drive_t *drive, u8 
 		return 0;
 
 	/* Capable of UltraDMA modes? */
-	if (id->field_valid & 4)
-		ultra_mask = id->dma_ultra & hwif->ultra_mask;
-	else
+	ultra_mask = id->dma_ultra & hwif->ultra_mask;
+
+	if (!(id->field_valid & 4))
 		mode = 0;	/* fallback to MW/SW DMA if no UltraDMA */
 
 	switch (mode) {
_