From b1f2940efa753f4a80032e904f04e2488dce0ce8 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Tue, 25 Mar 2008 16:50:45 +0800 Subject: [PATCH] --- yaml --- r: 89297 b: refs/heads/master c: 48feb3c419508487becfb9ea3afcc54c3eac6d80 h: refs/heads/master i: 89295: 3d963b90b44a88a3e75fbefd77167a051de3f8ce v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-acpi.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae219f1429cb..303917ac4738 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 094e50b2f74146d8ee924fea4808e58c4ed2f163 +refs/heads/master: 48feb3c419508487becfb9ea3afcc54c3eac6d80 diff --git a/trunk/drivers/ata/libata-acpi.c b/trunk/drivers/ata/libata-acpi.c index f88a4f940e11..8c1cfc645c85 100644 --- a/trunk/drivers/ata/libata-acpi.c +++ b/trunk/drivers/ata/libata-acpi.c @@ -839,7 +839,8 @@ void ata_acpi_on_resume(struct ata_port *ap) */ ata_link_for_each_dev(dev, &ap->link) { ata_acpi_clear_gtf(dev); - if (ata_dev_get_GTF(dev, NULL) >= 0) + if (ata_dev_enabled(dev) && + ata_dev_get_GTF(dev, NULL) >= 0) dev->flags |= ATA_DFLAG_ACPI_PENDING; } } else { @@ -849,7 +850,8 @@ void ata_acpi_on_resume(struct ata_port *ap) */ ata_link_for_each_dev(dev, &ap->link) { ata_acpi_clear_gtf(dev); - dev->flags |= ATA_DFLAG_ACPI_PENDING; + if (ata_dev_enabled(dev)) + dev->flags |= ATA_DFLAG_ACPI_PENDING; } } }