summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKai Lindhom <megantti@gmail.com>2006-09-07 21:25:51 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-07 15:23:04 -0700
commit09494d5d11628f118496747b74db3e56d071c6bc (patch)
tree6b5eb23a16c1a31f5785bfb9e8380d60f72269d3 /drivers
parenteaede2cb75f8f8d492342e7c1469635237b32795 (diff)
downloadblackbird-op-linux-09494d5d11628f118496747b74db3e56d071c6bc.tar.gz
blackbird-op-linux-09494d5d11628f118496747b74db3e56d071c6bc.zip
usbtouchscreen: fix ITM data reading
From: Kai Lindhom <megantti@gmail.com> Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/input/usbtouchscreen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 3b175aa482cd..a338bf4c2d78 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -286,7 +286,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
{
*x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);
- *x = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
+ *y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
*press = ((pkt[2] & 0x1F) << 7) | (pkt[5] & 0x7F);
*touch = ~pkt[7] & 0x20;
OpenPOWER on IntegriCloud