diff --git a/[refs] b/[refs] index b0c7f74795d5..1e4c8040cc35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c010de7506954e973abfab5c5999c5a97f7a73e +refs/heads/master: 07ddf768d860bee7bd6581b7af3ce1009dbd05d0 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 71caa7d983a3..b649ac7122a5 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -730,14 +730,14 @@ static int acpi_ec_add(struct acpi_device *device) static int acpi_ec_remove(struct acpi_device *device, int type) { struct acpi_ec *ec; - struct acpi_ec_query_handler *handler; + struct acpi_ec_query_handler *handler, *tmp; if (!device) return -EINVAL; ec = acpi_driver_data(device); mutex_lock(&ec->lock); - list_for_each_entry(handler, &ec->list, node) { + list_for_each_entry_safe(handler, tmp, &ec->list, node) { list_del(&handler->node); kfree(handler); }