From 4f287e1c530022268e521d85ebb78ab13160a038 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Mon, 13 Apr 2009 20:50:00 +0400
Subject: [PATCH] --- yaml --- r: 143483 b: refs/heads/master c:
 62afe5d744047df8ff15a369f4c1ebad71c937d4 h: refs/heads/master i:   143481:
 a9be423f5e9da7f509471e8feef152e03914d73c   143479:
 62121d3cf66988e26d2b24d71ef8700dca427c17 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bdc65b1a34ac..69f66d7e56b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20cbf5f8c0fe3df2ddbde1f334993b4dda18a651
+refs/heads/master: 62afe5d744047df8ff15a369f4c1ebad71c937d4
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index a61af3818c84..17c5d48a75d2 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -1656,8 +1656,8 @@ unsigned long ata_id_xfermask(const u16 *id)
 		/*
 		 *	Process compact flash extended modes
 		 */
-		int pio = id[163] & 0x7;
-		int dma = (id[163] >> 3) & 7;
+		int pio = (id[ATA_ID_CFA_MODES] >> 0) & 0x7;
+		int dma = (id[ATA_ID_CFA_MODES] >> 3) & 0x7;
 
 		if (pio)
 			pio_mask |= (1 << 5);
@@ -2426,7 +2426,8 @@ int ata_dev_configure(struct ata_device *dev)
 	/* ATA-specific feature tests */
 	if (dev->class == ATA_DEV_ATA) {
 		if (ata_id_is_cfa(id)) {
-			if (id[162] & 1) /* CPRM may make this media unusable */
+			/* CPRM may make this media unusable */
+			if (id[ATA_ID_CFA_KEY_MGMT] & 1)
 				ata_dev_printk(dev, KERN_WARNING,
 					       "supports DRM functions and may "
 					       "not be fully accessable.\n");