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

Commit e911d27a authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-11917' into release

parents 50f19e37 d21cf3c1

drivers/acpi/ec.c

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static acpi_status 
ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)

{

	acpi_status status;

	unsigned long long tmp;

	unsigned long long tmp = 0;



	struct acpi_ec *ec = context;

	status = acpi_walk_resources(handle, METHOD_NAME__CRS,
@@ -751,6 +751,7 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) 
		return status;

	ec->gpe = tmp;

	/* Use the global lock for all EC transactions? */

	tmp = 0;

	acpi_evaluate_integer(handle, "_GLK", NULL, &tmp);

	ec->global_lock = tmp;

	ec->handle = handle;