revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / olpc.c

diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index a2bd899b2b83aee250dd050f1dd3ca5906b157be..0e0cdde519be93a3cda8bab4ba6d8637632171ef 100644 (file)
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -114,7 +114,6 @@ 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);
 
@@ -170,9 +169,7 @@ restart:
                        if (wait_on_obf(0x6c, 1)) {
                                printk(KERN_ERR "olpc-ec:  timeout waiting for"
                                                " EC to provide data!\n");
-                               if (restarts++ < 10)
-                                       goto restart;
-                               goto err;
+                               goto restart;
                        }
                        outbuf[i] = inb(0x68);
                        pr_devel("olpc-ec:  received 0x%x\n", outbuf[i]);