瀏覽代碼

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
Linus Torvalds 8 年之前
父節點
當前提交
e50f82f809
共有 2 個文件被更改,包括 2 次插入0 次删除
  1. 1 0
      drivers/input/sparse-keymap.c
  2. 1 0
      drivers/input/touchscreen/ar1021_i2c.c

+ 1 - 0
drivers/input/sparse-keymap.c

@@ -255,6 +255,7 @@ void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *k
 
 
 	case KE_VSW:
 	case KE_VSW:
 		input_report_switch(dev, ke->sw.code, value);
 		input_report_switch(dev, ke->sw.code, value);
+		input_sync(dev);
 		break;
 		break;
 	}
 	}
 }
 }

+ 1 - 0
drivers/input/touchscreen/ar1021_i2c.c

@@ -117,6 +117,7 @@ static int ar1021_i2c_probe(struct i2c_client *client,
 	input->open = ar1021_i2c_open;
 	input->open = ar1021_i2c_open;
 	input->close = ar1021_i2c_close;
 	input->close = ar1021_i2c_close;
 
 
+	__set_bit(INPUT_PROP_DIRECT, input->propbit);
 	input_set_capability(input, EV_KEY, BTN_TOUCH);
 	input_set_capability(input, EV_KEY, BTN_TOUCH);
 	input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0);
 	input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0);
 	input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0);
 	input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0);