Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e540486 authored by Hannes Eder's avatar Hannes Eder Committed by Len Brown
Browse files

ACPI: EC: fix compilation warning 



Fix the warning introduced in commit c5279dee,
and give the dummy variable a more verbose name.

  drivers/acpi/ec.c: In function 'acpi_ec_ecdt_probe':
  drivers/acpi/ec.c:1015: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: default avatarHannes Eder <hannes@hanneseder.net>
Acked-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c5279dee

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -979,6 +979,7 @@ int __init acpi_ec_ecdt_probe(void) 
{

	acpi_status status;

	struct acpi_table_ecdt *ecdt_ptr;

	acpi_handle dummy;



	boot_ec = make_acpi_ec();

	if (!boot_ec)
@@ -1011,7 +1012,6 @@ int __init acpi_ec_ecdt_probe(void) 
	}

	/* This workaround is needed only on some broken machines,

	 * which require early EC, but fail to provide ECDT */

	acpi_handle x;

	printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");

	status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,

					boot_ec, NULL);
@@ -1022,7 +1022,7 @@ int __init acpi_ec_ecdt_probe(void) 
	 * which needs it, has fake EC._INI method, so use it as flag.

	 * Keep boot_ec struct as it will be needed soon.

	 */

	if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))

	if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))

		return -ENODEV;

install:

	if (!ec_install_handlers(boot_ec)) {