--- arch/x86/kernel/olpc.c

+++ arch/x86/kernel/olpc.c

@@ -115,6 +115,7 @@ int olpc_ec_cmd(unsigned char cmd, unsig

unsigned long flags;

int ret = -EIO;

int i;

+ int restarts = 0;

spin_lock_irqsave(&ec_lock, flags);

@@ -171,7 +172,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);

printk(KERN_DEBUG "olpc-ec: received 0x%x\n",