* [PATCH] wacom: fix pressure in Cintiq 21UX2
@ 2010-10-08 14:16 Aristeu Rozanski
2010-10-08 18:20 ` Ping Cheng
0 siblings, 1 reply; 3+ messages in thread
From: Aristeu Rozanski @ 2010-10-08 14:16 UTC (permalink / raw)
To: linux-kernel; +Cc: Ping Cheng
Currently the pressure range in Cintiq 21UX2 is limited to half of the
supported. This patch fixes the problem.
Signed-off-by: Aristeu Rozanski <aris@redhat.com>
---
drivers/input/tablet/wacom_wac.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linus-2.6.orig/drivers/input/tablet/wacom_wac.c 2010-09-22 14:52:22.000000000 -0400
+++ linus-2.6/drivers/input/tablet/wacom_wac.c 2010-10-07 17:20:30.000000000 -0400
@@ -442,7 +442,8 @@ static void wacom_intuos_general(struct
/* general pen packet */
if ((data[1] & 0xb8) == 0xa0) {
t = (data[6] << 2) | ((data[7] >> 6) & 3);
- if (features->type >= INTUOS4S && features->type <= INTUOS4L)
+ if (features->type >= INTUOS4S && features->type <= INTUOS4L ||
+ features->type == WACOM_21UX2)
t = (t << 1) | (data[1] & 1);
input_report_abs(input, ABS_PRESSURE, t);
input_report_abs(input, ABS_TILT_X,
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] wacom: fix pressure in Cintiq 21UX2
2010-10-08 14:16 [PATCH] wacom: fix pressure in Cintiq 21UX2 Aristeu Rozanski
@ 2010-10-08 18:20 ` Ping Cheng
2010-10-10 21:17 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Ping Cheng @ 2010-10-08 18:20 UTC (permalink / raw)
To: Aristeu Rozanski; +Cc: linux-kernel, Dmitry Torokhov
On Fri, Oct 8, 2010 at 7:16 AM, Aristeu Rozanski <aris@redhat.com> wrote:
> Currently the pressure range in Cintiq 21UX2 is limited to half of the
> supported. This patch fixes the problem.
>
> Signed-off-by: Aristeu Rozanski <aris@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Thank you Aristeu.
Dmitry, this patch should be backported since it is a bug fix.
Ping
> ---
> drivers/input/tablet/wacom_wac.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- linus-2.6.orig/drivers/input/tablet/wacom_wac.c 2010-09-22 14:52:22.000000000 -0400
> +++ linus-2.6/drivers/input/tablet/wacom_wac.c 2010-10-07 17:20:30.000000000 -0400
> @@ -442,7 +442,8 @@ static void wacom_intuos_general(struct
> /* general pen packet */
> if ((data[1] & 0xb8) == 0xa0) {
> t = (data[6] << 2) | ((data[7] >> 6) & 3);
> - if (features->type >= INTUOS4S && features->type <= INTUOS4L)
> + if (features->type >= INTUOS4S && features->type <= INTUOS4L ||
> + features->type == WACOM_21UX2)
> t = (t << 1) | (data[1] & 1);
> input_report_abs(input, ABS_PRESSURE, t);
> input_report_abs(input, ABS_TILT_X,
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] wacom: fix pressure in Cintiq 21UX2
2010-10-08 18:20 ` Ping Cheng
@ 2010-10-10 21:17 ` Dmitry Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2010-10-10 21:17 UTC (permalink / raw)
To: Ping Cheng; +Cc: Aristeu Rozanski, linux-kernel
On Fri, Oct 08, 2010 at 11:20:18AM -0700, Ping Cheng wrote:
> On Fri, Oct 8, 2010 at 7:16 AM, Aristeu Rozanski <aris@redhat.com> wrote:
> > Currently the pressure range in Cintiq 21UX2 is limited to half of the
> > supported. This patch fixes the problem.
> >
> > Signed-off-by: Aristeu Rozanski <aris@redhat.com>
>
> Acked-by: Ping Cheng <pingc@wacom.com>
>
> Thank you Aristeu.
>
> Dmitry, this patch should be backported since it is a bug fix.
>
OK, will mark it for stable.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-10 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-08 14:16 [PATCH] wacom: fix pressure in Cintiq 21UX2 Aristeu Rozanski
2010-10-08 18:20 ` Ping Cheng
2010-10-10 21:17 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox