aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2006-12-07 18:42:16 +0300
committerLen Brown <len.brown@intel.com>2006-12-08 02:56:05 -0500
commit5c4064124a5720a2576eb4bd5b7200d70052e9b5 (patch)
tree1a6c701c27f3efa929e009e8e635f7c0412eb3cc /drivers/acpi
parentACPI: ec: Enable EC GPE at beginning of transaction (diff)
downloadlinux-dev-5c4064124a5720a2576eb4bd5b7200d70052e9b5.tar.xz
linux-dev-5c4064124a5720a2576eb4bd5b7200d70052e9b5.zip
ACPI: ec: Increase timeout from 50 to 500 ms to handle old slow machines.
http://bugzilla.kernel.org/show_bug.cgi?id=7466 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3ffe172d1a88..46a132d613bc 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -65,10 +65,10 @@ enum {
ACPI_EC_EVENT_IBF_0, /* Input buffer empty */
};
-#define ACPI_EC_DELAY 50 /* Wait 50ms max. during EC ops */
+#define ACPI_EC_DELAY 500 /* Wait 500ms max. during EC ops */
#define ACPI_EC_UDELAY_GLK 1000 /* Wait 1ms max. to get global lock */
#define ACPI_EC_UDELAY 100 /* Poll @ 100us increments */
-#define ACPI_EC_UDELAY_COUNT 1000 /* Wait 10ms max. during EC ops */
+#define ACPI_EC_UDELAY_COUNT 1000 /* Wait 100ms max. during EC ops */
enum {
EC_INTR = 1, /* Output buffer full */