aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/ec.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1feedcea2d40..d6bf0578737b 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -891,6 +891,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
891 return -EINVAL; 891 return -EINVAL;
892 892
893 ec = acpi_driver_data(device); 893 ec = acpi_driver_data(device);
894 ec_remove_handlers(ec);
894 mutex_lock(&ec->lock); 895 mutex_lock(&ec->lock);
895 list_for_each_entry_safe(handler, tmp, &ec->list, node) { 896 list_for_each_entry_safe(handler, tmp, &ec->list, node) {
896 list_del(&handler->node); 897 list_del(&handler->node);
@@ -928,19 +929,6 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
928 return AE_OK; 929 return AE_OK;
929} 930}
930 931
931static int acpi_ec_stop(struct acpi_device *device, int type)
932{
933 struct acpi_ec *ec;
934 if (!device)
935 return -EINVAL;
936 ec = acpi_driver_data(device);
937 if (!ec)
938 return -EINVAL;
939 ec_remove_handlers(ec);
940
941 return 0;
942}
943
944int __init acpi_boot_ec_enable(void) 932int __init acpi_boot_ec_enable(void)
945{ 933{
946 if (!boot_ec || test_bit(EC_FLAGS_HANDLERS_INSTALLED, &boot_ec->flags)) 934 if (!boot_ec || test_bit(EC_FLAGS_HANDLERS_INSTALLED, &boot_ec->flags))
@@ -1061,7 +1049,6 @@ static struct acpi_driver acpi_ec_driver = {
1061 .ops = { 1049 .ops = {
1062 .add = acpi_ec_add, 1050 .add = acpi_ec_add,
1063 .remove = acpi_ec_remove, 1051 .remove = acpi_ec_remove,
1064 .stop = acpi_ec_stop,
1065 .suspend = acpi_ec_suspend, 1052 .suspend = acpi_ec_suspend,
1066 .resume = acpi_ec_resume, 1053 .resume = acpi_ec_resume,
1067 }, 1054 },