diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-20 14:46:13 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-20 14:46:13 -0400 |
| commit | 78ba6223a14eac73a1fbfc35bd456348171bffc6 (patch) | |
| tree | db50b17e03f3772443798415654c873d769a54ec /arch/x86/platform/olpc/olpc.c | |
| parent | f392cbf75615e9d8cb90ef5ffb8d4e752b7be3c7 (diff) | |
| parent | 04aa37b5f943920017ad094e776cd5514b1a9246 (diff) | |
Merge commit 'v3.0.4' into linaro-3.0linux-linaro-3.0-2011.09-0
Diffstat (limited to 'arch/x86/platform/olpc/olpc.c')
| -rw-r--r-- | arch/x86/platform/olpc/olpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c index 0060fd59ea0..02e39345dc6 100644 --- a/arch/x86/platform/olpc/olpc.c +++ b/arch/x86/platform/olpc/olpc.c @@ -157,13 +157,13 @@ restart: if (inbuf && inlen) { /* write data to EC */ for (i = 0; i < inlen; i++) { + pr_devel("olpc-ec: sending cmd arg 0x%x\n", inbuf[i]); + outb(inbuf[i], 0x68); if (wait_on_ibf(0x6c, 0)) { printk(KERN_ERR "olpc-ec: timeout waiting for" " EC accept data!\n"); goto err; } - pr_devel("olpc-ec: sending cmd arg 0x%x\n", inbuf[i]); - outb(inbuf[i], 0x68); } } if (outbuf && outlen) { |