diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:12 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:12 +0000 |
| commit | 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 (patch) | |
| tree | bcd8a465296d90b88f188cea2c6ca6cde01b7480 /drivers/input/touchscreen/s3c2410_ts.c | |
| parent | c520396b96bc826ff0f2df8aeead5b76df316e0c (diff) | |
fix-rebase-dust.patch
Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this,
clean it back out
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/input/touchscreen/s3c2410_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 774b71ba1dd..8f0afc3e023 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -131,9 +131,11 @@ static void touch_timer_fire(unsigned long data) // if we need to send an untouch event, but we haven't yet sent the // touch event (this happens if the touchscreen was tapped lightly), // send the touch event first - if (!updown && !ts.flag_first_touch_sent && ts.count != 0) { - input_report_abs(ts.dev, ABS_X, ts.xp >> ts.shift); - input_report_abs(ts.dev, ABS_Y, ts.yp >> ts.shift); + if (!updown && !ts.flag_first_touch_sent) { + if (ts.tsf[0]) + (ts.tsf[0]->api->scale)(ts.tsf[0], &ts.coords[0]); + input_report_abs(ts.dev, ABS_X, ts.coords[0]); + input_report_abs(ts.dev, ABS_Y, ts.coords[1]); input_report_key(ts.dev, BTN_TOUCH, 1); input_report_abs(ts.dev, ABS_PRESSURE, 1); |