---

yaml --- r: 33847 b: refs/heads/master c: 09494d5 h: refs/heads/master i: 33845: bc80576 33843: f30f41f 33839: 609fb1e v: v3
git-mirror · Sep 7, 2006 · a50f5d6 · a50f5d6
1 parent 34acbf4
commit a50f5d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaede2cb75f8f8d492342e7c1469635237b32795
+refs/heads/master: 09494d5d11628f118496747b74db3e56d071c6bc
diff --git a/trunk/drivers/usb/input/usbtouchscreen.c b/trunk/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;