From f074c80e9d8042b20560838587ea6b88ccb6218b Mon Sep 17 00:00:00 2001 From: Shane Huang Date: Sun, 18 Nov 2012 04:44:41 +0800 Subject: [PATCH] --- yaml --- r: 344419 b: refs/heads/master c: de90cd71f68e947d3bd6c3f2ef5731ead010a768 h: refs/heads/master i: 344417: 0f5348e771c6b5977d154ee8461b43da2af5e94e 344415: b9509cbae88f51f9fc2f6bfb3e51508af3085bb0 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 d87dedf6905b..e70fe8939a55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d0cdb028f9d9771e2b346038707734121f906e3 +refs/heads/master: de90cd71f68e947d3bd6c3f2ef5731ead010a768 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index f46fbd3bd3fb..caffe73c1e4a 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -2330,9 +2330,8 @@ 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_ncq(dev->id)) { + if (ata_id_has_hw_feature_ctrl(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 408da9502177..18cbb93fdbca 100644 --- a/trunk/include/linux/ata.h +++ b/trunk/include/linux/ata.h @@ -593,6 +593,7 @@ 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) {