diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 00:00:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 00:00:33 -0700 |
| commit | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (patch) | |
| tree | 6d58e91731385281436da191e82c56cd1627482f /drivers/input/touchscreen/ucb1400_ts.c | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 59cc1dd97ca9ac0363ef2f770901fbd86e2b970a (diff) | |
| download | op-kernel-dev-ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d.zip op-kernel-dev-ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d.tar.gz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/ucb1400_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 5498662..e868264 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c @@ -151,12 +151,14 @@ static void ucb1400_ts_evt_add(struct input_dev *idev, u16 pressure, u16 x, u16 input_report_abs(idev, ABS_X, x); input_report_abs(idev, ABS_Y, y); input_report_abs(idev, ABS_PRESSURE, pressure); + input_report_key(idev, BTN_TOUCH, 1); input_sync(idev); } static void ucb1400_ts_event_release(struct input_dev *idev) { input_report_abs(idev, ABS_PRESSURE, 0); + input_report_key(idev, BTN_TOUCH, 0); input_sync(idev); } @@ -377,7 +379,8 @@ static int ucb1400_ts_probe(struct platform_device *dev) ucb->ts_idev->id.product = ucb->id; ucb->ts_idev->open = ucb1400_ts_open; ucb->ts_idev->close = ucb1400_ts_close; - ucb->ts_idev->evbit[0] = BIT_MASK(EV_ABS); + ucb->ts_idev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY); + ucb->ts_idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); ucb1400_adc_enable(ucb->ac97); x_res = ucb1400_ts_read_xres(ucb); |
