aboutsummaryrefslogtreecommitdiff
path: root/drivers/ata/libata-core.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2012-12-14 09:34:01 -0500
committerJeff Garzik <jgarzik@redhat.com>2012-12-14 09:34:01 -0500
commit8349e5aeaadd160b7cce554a62a05be4b2d894aa (patch)
tree63025f59280dcf5276e9b551391025481f59ac84 /drivers/ata/libata-core.c
parent84043ac26ed120826db8e6198531da888c6e57b0 (diff)
downloadlinux-linaro-stable-8349e5aeaadd160b7cce554a62a05be4b2d894aa.tar.gz
Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"
This reverts commit de90cd71f68e947d3bd6c3f2ef5731ead010a768. Shane Huang writes: Please suspend this patch because I just received two new DevSlp drives but found word 78 bit 5 is _not_ set. I'm checking with the drive vendor whether he gave me the wrong information. If bit 5 is not the necessary and sufficient condition, I will implement another patch to replace ata_device->sata_settings into ->devslp_timing. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r--drivers/ata/libata-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 47d59616fe3d..9e8b99af400d 100644
--- a/drivers/ata/libata-core.c
+++ b/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,