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

Commit d21cf3c1 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI EC: Fix regression due to use of uninitialized variable 

breakage introduced by following patch
commit 27663c58
Author: Matthew Wilcox <willy@linux.intel.com>
Date:   Fri Oct 10 02:22:59 2008 -0400

acpi_evaluate_integer() does not clear passed variable if
there is an error at evaluation.
So if we ignore error, we must supply initialized variable.

http://bugzilla.kernel.org/show_bug.cgi?id=11917



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 457d2ee2

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;