diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
commit | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (patch) | |
tree | 3181c183b463e745601b1f4efda0f8fff3f1c08b /arch/x86/platform/olpc/olpc.c | |
parent | e80ca144ea902efa7aed446780fd9fad421fd8d3 (diff) | |
parent | 671ee7f0ce62e4b991b47fcf1c161c3f710dabbc (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus
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 8b9940e78e2f..7cce722667b8 100644 --- a/arch/x86/platform/olpc/olpc.c +++ b/arch/x86/platform/olpc/olpc.c | |||
@@ -161,13 +161,13 @@ restart: | |||
161 | if (inbuf && inlen) { | 161 | if (inbuf && inlen) { |
162 | /* write data to EC */ | 162 | /* write data to EC */ |
163 | for (i = 0; i < inlen; i++) { | 163 | for (i = 0; i < inlen; i++) { |
164 | pr_devel("olpc-ec: sending cmd arg 0x%x\n", inbuf[i]); | ||
165 | outb(inbuf[i], 0x68); | ||
164 | if (wait_on_ibf(0x6c, 0)) { | 166 | if (wait_on_ibf(0x6c, 0)) { |
165 | printk(KERN_ERR "olpc-ec: timeout waiting for" | 167 | printk(KERN_ERR "olpc-ec: timeout waiting for" |
166 | " EC accept data!\n"); | 168 | " EC accept data!\n"); |
167 | goto err; | 169 | goto err; |
168 | } | 170 | } |
169 | pr_devel("olpc-ec: sending cmd arg 0x%x\n", inbuf[i]); | ||
170 | outb(inbuf[i], 0x68); | ||
171 | } | 171 | } |
172 | } | 172 | } |
173 | if (outbuf && outlen) { | 173 | if (outbuf && outlen) { |