From 39195406873460ab340068a13b422d0823096c27 Mon Sep 17 00:00:00 2001 From: Roy Yin Date: Sun, 21 Feb 2010 22:52:49 -0800 Subject: [PATCH] --- yaml --- r: 180719 b: refs/heads/master c: eb083ba260f21ad79e83e1ad05a0d27e93b58c83 h: refs/heads/master i: 180717: 2a8e1479d71669ac1d1652439fcef4acebb4e752 180715: 57f43d684b43c962a66e5a6f16bc2fe4c3f2bd6c 180711: 6cce01b30895b180a187c210f22d81a804cd3b0d 180703: f50bf19aa927b129fb8b63f1f59801521518f2ae v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/usbtouchscreen.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bdf298eb9458..7f5ed7613403 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9c4f846997c6d37e4f56907d93f1be022c17c6b +refs/heads/master: eb083ba260f21ad79e83e1ad05a0d27e93b58c83 diff --git a/trunk/drivers/input/touchscreen/usbtouchscreen.c b/trunk/drivers/input/touchscreen/usbtouchscreen.c index 09a5e7341bd5..5256123a5228 100644 --- a/trunk/drivers/input/touchscreen/usbtouchscreen.c +++ b/trunk/drivers/input/touchscreen/usbtouchscreen.c @@ -618,8 +618,8 @@ static int idealtek_read_data(struct usbtouch_usb *dev, unsigned char *pkt) #ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH static int general_touch_read_data(struct usbtouch_usb *dev, unsigned char *pkt) { - dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1] ; - dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3] ; + dev->x = (pkt[2] << 8) | pkt[1]; + dev->y = (pkt[4] << 8) | pkt[3]; dev->press = pkt[5] & 0xff; dev->touch = pkt[0] & 0x01; @@ -809,9 +809,9 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { #ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH [DEVTYPE_GENERAL_TOUCH] = { .min_xc = 0x0, - .max_xc = 0x0500, + .max_xc = 0x7fff, .min_yc = 0x0, - .max_yc = 0x0500, + .max_yc = 0x7fff, .rept_size = 7, .read_data = general_touch_read_data, },