Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / evregion.c

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 28b447ff92df6ef7803026ca99a22d974729109a..bb58419f0d610e559eca0ed93458241acaa5af81 100644 (file)
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -298,6 +298,16 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                ACPI_EXCEPTION((AE_INFO, status, "Returned by Handler for [%s]",
                                acpi_ut_get_region_name(region_obj->region.
                                                        space_id)));
+
+               /*
+                * Special case for an EC timeout. These are seen so frequently
+                * that an additional error message is helpful
+                */
+               if ((region_obj->region.space_id == ACPI_ADR_SPACE_EC) &&
+                   (status == AE_TIME)) {
+                       ACPI_ERROR((AE_INFO,
+                                   "Timeout from EC hardware or EC device driver"));
+               }
        }
 
        if (!(handler_desc->address_space.handler_flags &