commit 3649c06e66ad3589374e8765ed69eda65658735c
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Wed May 16 00:51:46 2007 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Wed May 16 00:51:46 2007 +0200
tree f1ab3e892a8c6719f5d986185b86046c2e2a25c5
parent 4728d546d7137ad5350cc2e53d4748fd26f61a60

ide: add missing validity checks for identify words 62 and 63

Check validity of identify words 62 and 63 before using them in
ide_get_mode_mask().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-dma.c

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index de33e6f..ada2a3e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -731,10 +731,12 @@
 			mask &= 0x07;
 		break;
 	case XFER_MW_DMA_0:
-		mask = id->dma_mword & hwif->mwdma_mask;
+		if (id->field_valid & 2)
+			mask = id->dma_mword & hwif->mwdma_mask;
 		break;
 	case XFER_SW_DMA_0:
-		mask = id->dma_1word & hwif->swdma_mask;
+		if (id->field_valid & 2)
+			mask = id->dma_1word & hwif->swdma_mask;
 		break;
 	default:
 		BUG();