From 813f197a8c550ec4fefa29d5cc3281774b5f511a Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Wed, 26 May 2010 23:30:54 -0700 Subject: [PATCH] --- yaml --- r: 198879 b: refs/heads/master c: 388bbcade41ee68d2d1ebb51a538380ea48ae599 h: refs/heads/master i: 198877: 2c99f3219e8ac1bf7a2ded9fd2d06bcf0086c028 198875: 59a0085a3011844b33e884ab37dacd9ce4d5d3cf 198871: e482fe31ad9daeeb1193b6cffafc34716a99d29a 198863: d779a24cd6274fa1466ff0154345d3e76dd2cd4b 198847: af2d0700fb31993be702722e2c35edf681b44b8d v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/usbtouchscreen.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20c8fc10d08b..b262ced64fbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 067fb2f648543894ce775082c5636f4c32b99e4f +refs/heads/master: 388bbcade41ee68d2d1ebb51a538380ea48ae599 diff --git a/trunk/drivers/input/touchscreen/usbtouchscreen.c b/trunk/drivers/input/touchscreen/usbtouchscreen.c index 0b0ae2e17a60..82227b00d4b9 100644 --- a/trunk/drivers/input/touchscreen/usbtouchscreen.c +++ b/trunk/drivers/input/touchscreen/usbtouchscreen.c @@ -857,6 +857,11 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt) if ((pkt[0] & 0xe0) != 0xe0) return 0; + if (be16_to_cpu(packet->data_len) > 0xff) + packet->data_len = cpu_to_be16(be16_to_cpu(packet->data_len) - 0x100); + if (be16_to_cpu(packet->x_len) > 0xff) + packet->x_len = cpu_to_be16(be16_to_cpu(packet->x_len) - 0x80); + /* send ACK */ ret = usb_submit_urb(priv->ack, GFP_ATOMIC); @@ -1112,7 +1117,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { #ifdef CONFIG_TOUCHSCREEN_USB_NEXIO [DEVTYPE_NEXIO] = { - .rept_size = 128, + .rept_size = 1024, .irq_always = true, .read_data = nexio_read_data, .init = nexio_init,