ACPI / EC: Update acpi_ec_is_gpe_raised() with new GPE status flag.

[deliverable/linux.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 220d6406c9e93cbd7ed269fca5adbd94e3303152..99084e80a344c9ca2e26365b143c0972b60fe559 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -267,7 +267,7 @@ static inline bool acpi_ec_is_gpe_raised(struct acpi_ec *ec)
        acpi_event_status gpe_status = 0;
 
        (void)acpi_get_gpe_status(NULL, ec->gpe, &gpe_status);
-       return (gpe_status & ACPI_EVENT_FLAG_SET) ? true : false;
+       return (gpe_status & ACPI_EVENT_FLAG_STATUS_SET) ? true : false;
 }
 
 static inline void acpi_ec_enable_gpe(struct acpi_ec *ec, bool open)
@@ -861,7 +861,7 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
                }
        }
        mutex_unlock(&ec->mutex);
-       list_for_each_entry(handler, &free_list, node)
+       list_for_each_entry_safe(handler, tmp, &free_list, node)
                acpi_ec_put_query_handler(handler);
 }
 EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler);