projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
mfd
/
stmpe.c
diff --git
a/drivers/mfd/stmpe.c
b/drivers/mfd/stmpe.c
index 42ccd05445133444e52be15c4d380de7b4915539..4a91f6771fb82da541868250a6f85ccd76d24abd 100644
(file)
--- a/
drivers/mfd/stmpe.c
+++ b/
drivers/mfd/stmpe.c
@@
-706,7
+706,7
@@
static int stmpe1801_reset(struct stmpe *stmpe)
if (!(ret & STMPE1801_MSK_SYS_CTRL_RESET))
return 0;
usleep_range(100, 200);
- }
;
+ }
return -EIO;
}