projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lpfc: fix misleading indentation
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
input
/
input.c
diff --git
a/drivers/input/input.c
b/drivers/input/input.c
index c0446992892533b24d3853d043cf088451db5662..a161021c452615e9d2fb39169e9bb170e529f317 100644
(file)
--- a/
drivers/input/input.c
+++ b/
drivers/input/input.c
@@
-257,9
+257,10
@@
static int input_handle_abs_event(struct input_dev *dev,
}
static int input_get_disposition(struct input_dev *dev,
}
static int input_get_disposition(struct input_dev *dev,
- unsigned int type, unsigned int code, int
value
)
+ unsigned int type, unsigned int code, int
*pval
)
{
int disposition = INPUT_IGNORE_EVENT;
{
int disposition = INPUT_IGNORE_EVENT;
+ int value = *pval;
switch (type) {
switch (type) {
@@
-357,6
+358,7
@@
static int input_get_disposition(struct input_dev *dev,
break;
}
break;
}
+ *pval = value;
return disposition;
}
return disposition;
}
@@
-365,7
+367,7
@@
static void input_handle_event(struct input_dev *dev,
{
int disposition;
{
int disposition;
- disposition = input_get_disposition(dev, type, code, value);
+ disposition = input_get_disposition(dev, type, code,
&
value);
if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
dev->event(dev, type, code, value);
if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
dev->event(dev, type, code, value);
@@
-1866,6
+1868,10
@@
void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
break;
case EV_ABS:
break;
case EV_ABS:
+ input_alloc_absinfo(dev);
+ if (!dev->absinfo)
+ return;
+
__set_bit(code, dev->absbit);
break;
__set_bit(code, dev->absbit);
break;