git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.13-rc4' into next
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
touchscreen
/
cyttsp_core.c
diff --git
a/drivers/input/touchscreen/cyttsp_core.c
b/drivers/input/touchscreen/cyttsp_core.c
index 56088eceacdc54d19f3b91a31d606c63b485cc8a..eee656f77a2e3daa28a98727dbba5278026febc3 100644
(file)
--- a/
drivers/input/touchscreen/cyttsp_core.c
+++ b/
drivers/input/touchscreen/cyttsp_core.c
@@
-242,7
+242,7
@@
static int cyttsp_soft_reset(struct cyttsp *ts)
int retval;
/* wait for interrupt to set ready completion */
-
INIT_COMPLETION(
ts->bl_ready);
+
reinit_completion(&
ts->bl_ready);
ts->state = CY_BL_STATE;
enable_irq(ts->irq);