Skip to content

Commit e50f82f

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "Just a couple of fixups to the sparse-keymap module and the Microchip AR1021 touchscreen driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: sparse-keymap - send sync event for KE_SW/KE_VSW Input: ar1021_i2c - set INPUT_PROP_DIRECT
2 parents d4c2e9f + 6f29c24 commit e50f82f

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/input/sparse-keymap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *k
255255

256256
case KE_VSW:
257257
input_report_switch(dev, ke->sw.code, value);
258+
input_sync(dev);
258259
break;
259260
}
260261
}

drivers/input/touchscreen/ar1021_i2c.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ static int ar1021_i2c_probe(struct i2c_client *client,
117117
input->open = ar1021_i2c_open;
118118
input->close = ar1021_i2c_close;
119119

120+
__set_bit(INPUT_PROP_DIRECT, input->propbit);
120121
input_set_capability(input, EV_KEY, BTN_TOUCH);
121122
input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0);
122123
input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0);

0 commit comments

Comments
 (0)