projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' into staging/for_v3.4
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
touchscreen
/
fujitsu_ts.c
diff --git
a/drivers/input/touchscreen/fujitsu_ts.c
b/drivers/input/touchscreen/fujitsu_ts.c
index daf7a4afc9352e08afe3e04637a18bd8698382eb..80b21800355f10d255a8e8f06fdad8a3b37270fa 100644
(file)
--- a/
drivers/input/touchscreen/fujitsu_ts.c
+++ b/
drivers/input/touchscreen/fujitsu_ts.c
@@
-122,8
+122,8
@@
static int fujitsu_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.vendor = SERIO_FUJITSU;
input_dev->id.product = 0;
input_dev->id.version = 0x0100;
input_dev->id.vendor = SERIO_FUJITSU;
input_dev->id.product = 0;
input_dev->id.version = 0x0100;
- input_dev->evbit[0] = BIT
(EV_KEY) | BIT
(EV_ABS);
- input_dev->keybit[
LONG(BTN_TOUCH)] = BIT
(BTN_TOUCH);
+ input_dev->evbit[0] = BIT
_MASK(EV_KEY) | BIT_MASK
(EV_ABS);
+ input_dev->keybit[
BIT_WORD(BTN_TOUCH)] = BIT_MASK
(BTN_TOUCH);
input_set_abs_params(input_dev, ABS_X, 0, 4096, 0, 0);
input_set_abs_params(input_dev, ABS_Y, 0, 4096, 0, 0);
input_set_abs_params(input_dev, ABS_X, 0, 4096, 0, 0);
input_set_abs_params(input_dev, ABS_Y, 0, 4096, 0, 0);