Skip to content

Commit 86a159f

Browse files
Wer-Wolfgregkh
authored andcommitted
ACPI: EC: Fix oops when removing custom query handlers
[ Upstream commit e5b492c ] When removing custom query handlers, the handler might still be used inside the EC query workqueue, causing a kernel oops if the module holding the callback function was already unloaded. Fix this by flushing the EC query workqueue when removing custom query handlers. Tested on a Acer Travelmate 4002WLMi Signed-off-by: Armin Wolf <W_Armin@gmx.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a8267bc commit 86a159f

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

drivers/acpi/ec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,7 @@ static void acpi_ec_remove_query_handlers(struct acpi_ec *ec,
11211121
void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
11221122
{
11231123
acpi_ec_remove_query_handlers(ec, false, query_bit);
1124+
flush_workqueue(ec_query_wq);
11241125
}
11251126
EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler);
11261127

0 commit comments

Comments
 (0)