From eb2bf1a5d47d34a55e58c01911f6aa38109e04e4 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 14 Dec 2012 09:34:01 -0500
Subject: [PATCH] --- yaml --- r: 344437 b: refs/heads/master c:
 8349e5aeaadd160b7cce554a62a05be4b2d894aa h: refs/heads/master i:   344435:
 8cd5bf5b69b037ac35f50a65aac246e5039fb571 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 3 ++-
 trunk/include/linux/ata.h       | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 29ed25f8936c..660045d0a4a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84043ac26ed120826db8e6198531da888c6e57b0
+refs/heads/master: 8349e5aeaadd160b7cce554a62a05be4b2d894aa
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 47d59616fe3d..9e8b99af400d 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -2331,8 +2331,9 @@ int ata_dev_configure(struct ata_device *dev)
 
 		/* Obtain SATA Settings page from Identify Device Data Log,
 		 * which contains DevSlp timing variables etc.
+		 * Exclude old devices with ata_id_has_ncq()
 		 */
-		if (ata_id_has_hw_feature_ctrl(dev->id)) {
+		if (ata_id_has_ncq(dev->id)) {
 			err_mask = ata_read_log_page(dev,
 						     ATA_LOG_SATA_ID_DEV_DATA,
 						     ATA_LOG_SATA_SETTINGS,
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 18cbb93fdbca..408da9502177 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/include/linux/ata.h
@@ -593,7 +593,6 @@ static inline int ata_is_data(u8 prot)
 #define ata_id_cdb_intr(id)	(((id)[ATA_ID_CONFIG] & 0x60) == 0x20)
 #define ata_id_has_da(id)	((id)[ATA_ID_SATA_CAPABILITY_2] & (1 << 4))
 #define ata_id_has_devslp(id)	((id)[ATA_ID_FEATURE_SUPP] & (1 << 8))
-#define ata_id_has_hw_feature_ctrl(id)	((id)[ATA_ID_FEATURE_SUPP] & (1 << 5))
 
 static inline bool ata_id_has_hipm(const u16 *id)
 {