2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9cc38857c33b..047330929821 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -535,7 +535,8 @@ static int acpi_ec_sync_query(struct acpi_ec *ec)
                                 return -ENOMEM;
                         memcpy(copy, handler, sizeof(*copy));
                         pr_debug(PREFIX "push query execution (0x%2x) on queue\n", value);
-                        return acpi_os_execute(OSL_GPE_HANDLER,
+                        return acpi_os_execute((copy->func) ?
+                                OSL_NOTIFY_HANDLER : OSL_GPE_HANDLER,
                                 acpi_ec_run, copy);
                 }
         }
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index d9339806df45..fd09229282ea 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -242,7 +242,7 @@ static int smbus_alarm(void *context)
                 case ACPI_SBS_CHARGER:
                 case ACPI_SBS_MANAGER:
                 case ACPI_SBS_BATTERY:
-                        acpi_os_execute(OSL_GPE_HANDLER,
+                        acpi_os_execute(OSL_NOTIFY_HANDLER,
                                         acpi_smbus_callback, hc);
                 default:;
         }