aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/itmtouch.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/input/itmtouch.c')
-rw-r--r--drivers/usb/input/itmtouch.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 61966d719ca3..aac968aab860 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -36,7 +36,11 @@
36 * 36 *
37 * 1.2.1 09/03/2005 (HCE) hc@mivu.no 37 * 1.2.1 09/03/2005 (HCE) hc@mivu.no
38 * Code cleanup and adjusting syntax to start matching kernel standards 38 * Code cleanup and adjusting syntax to start matching kernel standards
39 * 39 *
40 * 1.2.2 10/05/2006 (MJA) massad@gmail.com
41 * Flag for detecting if the screen was being touch was incorrectly
42 * inverted, so no touch events were being detected.
43 *
40 *****************************************************************************/ 44 *****************************************************************************/
41 45
42#include <linux/kernel.h> 46#include <linux/kernel.h>
@@ -53,7 +57,7 @@
53#define USB_PRODUCT_ID_TOUCHPANEL 0xf9e9 57#define USB_PRODUCT_ID_TOUCHPANEL 0xf9e9
54 58
55#define DRIVER_AUTHOR "Hans-Christian Egtvedt <hc@mivu.no>" 59#define DRIVER_AUTHOR "Hans-Christian Egtvedt <hc@mivu.no>"
56#define DRIVER_VERSION "v1.2.1" 60#define DRIVER_VERSION "v1.2.2"
57#define DRIVER_DESC "USB ITM Inc Touch Panel Driver" 61#define DRIVER_DESC "USB ITM Inc Touch Panel Driver"
58#define DRIVER_LICENSE "GPL" 62#define DRIVER_LICENSE "GPL"
59 63
@@ -76,7 +80,7 @@ static struct usb_device_id itmtouch_ids [] = {
76 { } 80 { }
77}; 81};
78 82
79static void itmtouch_irq(struct urb *urb, struct pt_regs *regs) 83static void itmtouch_irq(struct urb *urb)
80{ 84{
81 struct itmtouch_dev *itmtouch = urb->context; 85 struct itmtouch_dev *itmtouch = urb->context;
82 unsigned char *data = urb->transfer_buffer; 86 unsigned char *data = urb->transfer_buffer;
@@ -105,10 +109,8 @@ static void itmtouch_irq(struct urb *urb, struct pt_regs *regs)
105 goto exit; 109 goto exit;
106 } 110 }
107 111
108 input_regs(dev, regs);
109
110 /* if pressure has been released, then don't report X/Y */ 112 /* if pressure has been released, then don't report X/Y */
111 if (data[7] & 0x20) { 113 if (!(data[7] & 0x20)) {
112 input_report_abs(dev, ABS_X, (data[0] & 0x1F) << 7 | (data[3] & 0x7F)); 114 input_report_abs(dev, ABS_X, (data[0] & 0x1F) << 7 | (data[3] & 0x7F));
113 input_report_abs(dev, ABS_Y, (data[1] & 0x1F) << 7 | (data[4] & 0x7F)); 115 input_report_abs(dev, ABS_Y, (data[1] & 0x1F) << 7 | (data[4] & 0x7F));
114 } 116 }