libata-acpi: don't call sleeping function from invalid context

The problem is introduced by commit
664d080c41463570b95717b5ad86e79dc1be0877.

acpi_evaluate_integer is a sleeping function,
and it should not be called with spin_lock_irqsave.
https://bugzilla.redhat.com/show_bug.cgi?id=451399

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index abea74b42a20b9dce487971dbe859e70b93da505..9330b7922f6281e758a795603d18e2550fb70da1 100644 (file)
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -197,6 +197,10 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
                /* This device does not support hotplug */
                return;
 
+       if (event == ACPI_NOTIFY_BUS_CHECK ||
+           event == ACPI_NOTIFY_DEVICE_CHECK)
+               status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+
        spin_lock_irqsave(ap->lock, flags);
 
        switch (event) {
@@ -204,7 +208,6 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
        case ACPI_NOTIFY_DEVICE_CHECK:
                ata_ehi_push_desc(ehi, "ACPI event");
 
-               status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
                if (ACPI_FAILURE(status)) {
                        ata_port_printk(ap, KERN_ERR,
                                "acpi: failed to determine bay status (0x%x)\n",