diff --git a/[refs] b/[refs] index a039bd378608..989070871d2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a83021a229016f93b4e532d9cef21b01be5a8bb7 +refs/heads/master: 5aa63f038f042fd1acd6e720a95df72857db0bc7 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 04e90443eff7..391f331674c7 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -1065,6 +1065,7 @@ static int acpi_ec_resume(struct acpi_device *device) struct acpi_ec *ec = acpi_driver_data(device); /* Enable use of GPE back */ clear_bit(EC_FLAGS_NO_GPE, &ec->flags); + set_bit(EC_FLAGS_GPE_MODE, &ec->flags); acpi_enable_gpe(NULL, ec->gpe); return 0; }