2006-09-07 19:26:43

by Daniel Ritz

Subject: PATCH] usbtouchscreen: fix ITM data reading

before 2.6.19, please :)

[PATCH] usbtouchscreen: fix ITM data reading

From: Kai Lindhom <[email protected]>
Signed-off-by: Daniel Ritz <[email protected]>

diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 3b175aa..a338bf4 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -286,7 +286,7 @@ #ifdef CONFIG_USB_TOUCHSCREEN_ITM
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;

2006-09-07 19:40:47

by Dmitry Torokhov

Subject: Re: PATCH] usbtouchscreen: fix ITM data reading

On Thursday 07 September 2006 15:25, Daniel Ritz wrote:
> before 2.6.19, please :)
>
> [PATCH] usbtouchscreen: fix ITM data reading
>
> From: Kai Lindhom <[email protected]>
> Signed-off-by: Daniel Ritz <[email protected]>
>

Acked-by: Dmitry Torokhov <[email protected]>

Greg, will you push it through your tree?

> diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
> index 3b175aa..a338bf4 100644
> --- a/drivers/usb/input/usbtouchscreen.c
> +++ b/drivers/usb/input/usbtouchscreen.c
> @@ -286,7 +286,7 @@ #ifdef CONFIG_USB_TOUCHSCREEN_ITM
> 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;
>
>

--
Dmitry