Merge branch 'bugzilla-11917' into release

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index ef42316f89f5..523ac5b229a5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -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;