summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDeepak Saxena <dsaxena@laptop.org>2008-07-24 12:13:08 -0700
committerDeepak Saxena <dsaxena@laptop.org>2008-07-24 12:13:08 -0700
commit284cecf34b83fb0ff961869802f37fc4c172bacf (patch)
tree70dfc212ade76b09c34af651e1a6a0f93883f273 /arch
parentd86980aeb8d0adb104c01d04a48ef9a3198a925a (diff)
downloadlwn-284cecf34b83fb0ff961869802f37fc4c172bacf.tar.gz
lwn-284cecf34b83fb0ff961869802f37fc4c172bacf.zip
Default to 40ms timeout for EC commands
This is what the 2.6.22 stable kernel uses so we should keep it the same until we know for sure how to make all EC timeouts dissapear. Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/olpc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index ff7282bd9bc3..3ca406145662 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -34,7 +34,8 @@ static DEFINE_SPINLOCK(ec_lock);
#define EC_BASE_TIMEOUT 20
/* the timeout that bugs in the EC might force us to actually use */
-static int ec_timeout = EC_BASE_TIMEOUT;
+/* Using 40ms for now to make some problems go away */
+static int ec_timeout = 40;
static int __init olpc_ec_timeout_set(char *str)
{