projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[platform/kernel/linux-rpi.git]
/
drivers
/
input
/
touchscreen
/
atmel_mxt_ts.c
diff --git
a/drivers/input/touchscreen/atmel_mxt_ts.c
b/drivers/input/touchscreen/atmel_mxt_ts.c
index
f5a86aa
..
383a848
100644
(file)
--- a/
drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/
drivers/input/touchscreen/atmel_mxt_ts.c
@@
-2180,11
+2180,11
@@
static int mxt_initialize(struct mxt_data *data)
msleep(MXT_FW_RESET_TIME);
}
- error = mxt_
acquire_irq
(data);
+ error = mxt_
check_retrigen
(data);
if (error)
return error;
- error = mxt_
check_retrigen
(data);
+ error = mxt_
acquire_irq
(data);
if (error)
return error;