diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-29 22:07:46 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-29 22:07:46 +0100 |
commit | 8c3f67e780eb4b98d8da964031662a6bef89e0a2 (patch) | |
tree | 56f5ba94d6ceab3ad9028dc69154e5f6996557ea | |
parent | 1b36fc0679dd940bbca7370a447a1915f60d4804 (diff) | |
parent | 3df663a147fe077a6ee8444ec626738946e65547 (diff) |
Merge branch 'acpi-ec' into linux-next
* acpi-ec:
ACPI: EC: Reference count query handlers under lock
-rw-r--r-- | drivers/acpi/ec.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d05be13c1022..08bc9751fe66 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1053,28 +1053,20 @@ void acpi_ec_unblock_transactions(void) Event Management -------------------------------------------------------------------------- */ static struct acpi_ec_query_handler * -acpi_ec_get_query_handler(struct acpi_ec_query_handler *handler) -{ - if (handler) - kref_get(&handler->kref); - return handler; -} - -static struct acpi_ec_query_handler * acpi_ec_get_query_handler_by_value(struct acpi_ec *ec, u8 value) { struct acpi_ec_query_handler *handler; - bool found = false; mutex_lock(&ec->mutex); list_for_each_entry(handler, &ec->list, node) { if (value == handler->query_bit) { - found = true; - break; + kref_get(&handler->kref); + mutex_unlock(&ec->mutex); + return handler; } } mutex_unlock(&ec->mutex); - return found ? acpi_ec_get_query_handler(handler) : NULL; + return NULL; } static void acpi_ec_query_handler_release(struct kref *kref) |