diff options
| author | Paul Fox <pgf@laptop.org> | 2010-10-01 18:17:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-08 10:06:09 +0200 |
| commit | 286e5b97eb22baab9d9a41ca76c6b933a484252c (patch) | |
| tree | 41c30e43ed2566b7c4f0bc7c935fa44a8fc39d43 /arch/x86/kernel/olpc.c | |
| parent | 3e3c486012a3dbb113c0ca15ee265d309d77aea9 (diff) | |
x86, olpc: Don't retry EC commands forever
Avoids a potential infinite loop.
It was observed once, during an EC hacking/debugging
session - not in regular operation.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Cc: dilinger@queued.net
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/olpc.c')
| -rw-r--r-- | arch/x86/kernel/olpc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c index 37c49934c785..747261302598 100644 --- a/arch/x86/kernel/olpc.c +++ b/arch/x86/kernel/olpc.c @@ -114,6 +114,7 @@ int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen, unsigned long flags; int ret = -EIO; int i; + int restarts = 0; spin_lock_irqsave(&ec_lock, flags); @@ -169,7 +170,9 @@ restart: if (wait_on_obf(0x6c, 1)) { printk(KERN_ERR "olpc-ec: timeout waiting for" " EC to provide data!\n"); - goto restart; + if (restarts++ < 10) + goto restart; + goto err; } outbuf[i] = inb(0x68); pr_devel("olpc-ec: received 0x%x\n", outbuf[i]); |