Merge branch 'acpi-hotplug'

[karo-tx-linux.git] / drivers / acpi / acpica / hwxface.c

diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 04c2e16f2c0a6ef86ab734cd309cfb1ce41d49db..5ee7a814cd9207db34d42b8945867e415ab733bb 100644 (file)
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -495,7 +495,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
         * Evaluate the \_Sx namespace object containing the register values
         * for this state
         */
-       info->pathname =
+       info->relative_pathname =
            ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);
        status = acpi_ns_evaluate(info);
        if (ACPI_FAILURE(status)) {
@@ -506,7 +506,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
 
        if (!info->return_object) {
                ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
-                           info->pathname));
+                           info->relative_pathname));
                status = AE_AML_NO_RETURN_VALUE;
                goto cleanup;
        }
@@ -528,10 +528,12 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
        elements = info->return_object->package.elements;
        switch (info->return_object->package.count) {
        case 0:
+
                status = AE_AML_PACKAGE_LIMIT;
                break;
 
        case 1:
+
                if (elements[0]->common.type != ACPI_TYPE_INTEGER) {
                        status = AE_AML_OPERAND_TYPE;
                        break;
@@ -545,6 +547,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
 
        case 2:
        default:
+
                if ((elements[0]->common.type != ACPI_TYPE_INTEGER) ||
                    (elements[1]->common.type != ACPI_TYPE_INTEGER)) {
                        status = AE_AML_OPERAND_TYPE;
@@ -565,7 +568,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status,
                                "While evaluating Sleep State [%s]",
-                               info->pathname));
+                               info->relative_pathname));
        }
 
        ACPI_FREE(info);