---

yaml --- r: 21905 b: refs/heads/master c: fb21f0d h: refs/heads/master i: 21903: eef31d6 v: v3
git-mirror · Mar 12, 2006 · e8e972e · e8e972e
1 parent b14af0c
commit e8e972e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2044470cccec1bfe6bb819027975df302ff43bf8
+refs/heads/master: fb21f0d0ec7e31cc814165e1a9d2662d9c9dd980
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
@@ -819,7 +819,10 @@ static unsigned int ata_id_xfermask(const u16 *id)
 	}
 
 	mwdma_mask = id[ATA_ID_MWDMA_MODES] & 0x07;
-	udma_mask = id[ATA_ID_UDMA_MODES] & 0xff;
+
+	udma_mask = 0;
+	if (id[ATA_ID_FIELD_VALID] & (1 << 2))
+		udma_mask = id[ATA_ID_UDMA_MODES] & 0xff;
 
 	return ata_pack_xfermask(pio_mask, mwdma_mask, udma_mask);
 }