Merge branches 'acpica' and 'acpi-tables'

[sfrench/cifs-2.6.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1af2125e17d53578602808a67321e8a89b794e61..599937d9b87e11d2135e307fa6daf017b151cb14 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1783,13 +1783,14 @@ static void __init acpi_ec_ecdt_start(void)
                return;
 
        status = acpi_get_handle(NULL, ecdt_ptr->id, &handle);
-       if (ACPI_FAILURE(status))
-               return;
+       if (ACPI_SUCCESS(status)) {
+               boot_ec->handle = handle;
 
-       boot_ec->handle = handle;
+               /* Add a special ACPI device object to represent the boot EC. */
+               acpi_bus_register_early_device(ACPI_BUS_TYPE_ECDT_EC);
+       }
 
-       /* Add a special ACPI device object to represent the boot EC. */
-       acpi_bus_register_early_device(ACPI_BUS_TYPE_ECDT_EC);
+       acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 /*
@@ -1891,12 +1892,12 @@ void __init acpi_ec_ecdt_probe(void)
                 * Asus X50GL:
                 * https://bugzilla.kernel.org/show_bug.cgi?id=11880
                 */
-               return;
+               goto out;
        }
 
        ec = acpi_ec_alloc();
        if (!ec)
-               return;
+               goto out;
 
        if (EC_FLAGS_CORRECT_ECDT) {
                ec->command_addr = ecdt_ptr->data.address;
@@ -1922,13 +1923,16 @@ void __init acpi_ec_ecdt_probe(void)
        ret = acpi_ec_setup(ec, NULL);
        if (ret) {
                acpi_ec_free(ec);
-               return;
+               goto out;
        }
 
        boot_ec = ec;
        boot_ec_is_ecdt = true;
 
        pr_info("Boot ECDT EC used to handle transactions\n");
+
+out:
+       acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 #ifdef CONFIG_PM_SLEEP