From: Greg Kroah-Hartman <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, pingc@wacom.com
Subject: [patch 6/7] USB: fix usb wacom tablet driver bug
Date: Tue, 16 Aug 2005 15:16:32 -0700 [thread overview]
Message-ID: <20050816221631.GG28619@kroah.com> (raw)
In-Reply-To: <20050816221527.GA28619@kroah.com>
[-- Attachment #1: usb-fix-wacom-bug.patch --]
[-- Type: text/plain, Size: 1941 bytes --]
From: Ping Cheng <pingc@wacom.com>
This patch fixes bug 4905 and a Cintiq 21UX bug.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/input/wacom.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
--- gregkh-2.6.orig/drivers/usb/input/wacom.c 2005-08-16 14:51:29.000000000 -0700
+++ gregkh-2.6/drivers/usb/input/wacom.c 2005-08-16 14:58:01.000000000 -0700
@@ -342,9 +342,6 @@ static void wacom_graphire_irq(struct ur
goto exit;
}
- x = le16_to_cpu(*(__le16 *) &data[2]);
- y = le16_to_cpu(*(__le16 *) &data[4]);
-
input_regs(dev, regs);
if (data[1] & 0x10) { /* in prox */
@@ -373,15 +370,17 @@ static void wacom_graphire_irq(struct ur
}
}
- if (data[1] & 0x80) {
+ if (data[1] & 0x90) {
+ x = le16_to_cpu(*(__le16 *) &data[2]);
+ y = le16_to_cpu(*(__le16 *) &data[4]);
input_report_abs(dev, ABS_X, x);
input_report_abs(dev, ABS_Y, y);
- }
- if (wacom->tool[0] != BTN_TOOL_MOUSE) {
- input_report_abs(dev, ABS_PRESSURE, le16_to_cpu(*(__le16 *) &data[6]));
- input_report_key(dev, BTN_TOUCH, data[1] & 0x01);
- input_report_key(dev, BTN_STYLUS, data[1] & 0x02);
- input_report_key(dev, BTN_STYLUS2, data[1] & 0x04);
+ if (wacom->tool[0] != BTN_TOOL_MOUSE) {
+ input_report_abs(dev, ABS_PRESSURE, le16_to_cpu(*(__le16 *) &data[6]));
+ input_report_key(dev, BTN_TOUCH, data[1] & 0x01);
+ input_report_key(dev, BTN_STYLUS, data[1] & 0x02);
+ input_report_key(dev, BTN_STYLUS2, data[1] & 0x04);
+ }
}
input_report_key(dev, wacom->tool[0], data[1] & 0x10);
@@ -568,7 +567,7 @@ static void wacom_intuos_irq(struct urb
/* Cintiq doesn't send data when RDY bit isn't set */
if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
- return;
+ goto exit;
if (wacom->features->type >= INTUOS3) {
input_report_abs(dev, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1));
--
next prev parent reply other threads:[~2005-08-16 22:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050816220001.699316000@press.kroah.org>
2005-08-16 22:15 ` [patch 0/7] fixes for 2.6.13-rc6 Greg Kroah-Hartman
2005-08-16 22:15 ` [patch 1/7] Driver core: potentially fix use after free in class_device_attr_show Greg Kroah-Hartman
2005-08-16 22:15 ` [patch 2/7] PCI: 6700/6702PXH quirk Greg Kroah-Hartman
2005-08-16 22:16 ` [patch 3/7] PCI: fix quirk-6700-fix.patch Greg Kroah-Hartman
2005-08-17 0:27 ` Andrew Morton
2005-08-17 18:45 ` Greg KH
2005-08-16 22:16 ` [patch 4/7] PCI Hotplug: new contact info Greg Kroah-Hartman
2005-08-16 22:16 ` [patch 5/7] PCI: update documentation Greg Kroah-Hartman
2005-08-16 22:16 ` Greg Kroah-Hartman [this message]
2005-08-16 22:16 ` [patch 7/7] USB: usbmon: Copyrights and a typo Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050816221631.GG28619@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pingc@wacom.com \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox