diff --git a/[refs] b/[refs]
index 4569a140d4d1..a8384304e056 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e4172cde0f793dbf48c99bdfd0abe7d18e4b09
+refs/heads/master: 1544fdbc857cbe8afca16a521d3254346befeb06
diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c
index bf60b24ebf54..06b78e5e33a1 100644
--- a/trunk/drivers/acpi/ec.c
+++ b/trunk/drivers/acpi/ec.c
@@ -445,9 +445,9 @@ EXPORT_SYMBOL_GPL(acpi_ec_add_query_handler);
 
 void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
 {
-	struct acpi_ec_query_handler *handler;
+	struct acpi_ec_query_handler *handler, *tmp;
 	mutex_lock(&ec->lock);
-	list_for_each_entry(handler, &ec->list, node) {
+	list_for_each_entry_safe(handler, tmp, &ec->list, node) {
 		if (query_bit == handler->query_bit) {
 			list_del(&handler->node);
 			kfree(handler);