* [PATCH 1/2] input : wacom - Simplify type check for newer V5 devices
@ 2012-11-21 18:42 Ping Cheng
2012-11-21 21:13 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Ping Cheng @ 2012-11-21 18:42 UTC (permalink / raw)
To: linux-input; +Cc: dmitry.torokhov, Ping Cheng
The updated type enum enables this implementation.
Signed-off-by: Ping Cheng <pingc@wacom.com>
---
drivers/input/tablet/wacom_wac.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 7554a04..f09f39e 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -467,9 +467,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
/* general pen packet */
if ((data[1] & 0xb8) == 0xa0) {
t = (data[6] << 2) | ((data[7] >> 6) & 3);
- if ((features->type >= INTUOS4S && features->type <= INTUOS4L) ||
- (features->type >= INTUOS5S && features->type <= INTUOS5L) ||
- (features->type >= WACOM_21UX2 && features->type <= WACOM_24HD)) {
+ if ((features->type >= INTUOS4S && features->type <= WACOM_24HD)) {
t = (t << 1) | (data[1] & 1);
}
input_report_abs(input, ABS_PRESSURE, t);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] input : wacom - Simplify type check for newer V5 devices
2012-11-21 18:42 [PATCH 1/2] input : wacom - Simplify type check for newer V5 devices Ping Cheng
@ 2012-11-21 21:13 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2012-11-21 21:13 UTC (permalink / raw)
To: Ping Cheng; +Cc: linux-input, Ping Cheng
On Wed, Nov 21, 2012 at 10:42:40AM -0800, Ping Cheng wrote:
> The updated type enum enables this implementation.
>
> Signed-off-by: Ping Cheng <pingc@wacom.com>
> ---
> drivers/input/tablet/wacom_wac.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 7554a04..f09f39e 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -467,9 +467,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
> /* general pen packet */
> if ((data[1] & 0xb8) == 0xa0) {
> t = (data[6] << 2) | ((data[7] >> 6) & 3);
> - if ((features->type >= INTUOS4S && features->type <= INTUOS4L) ||
> - (features->type >= INTUOS5S && features->type <= INTUOS5L) ||
> - (features->type >= WACOM_21UX2 && features->type <= WACOM_24HD)) {
> + if ((features->type >= INTUOS4S && features->type <= WACOM_24HD)) {
This has extra parenthesis.
Anyway, applied both, thanks Ping.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-21 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-21 18:42 [PATCH 1/2] input : wacom - Simplify type check for newer V5 devices Ping Cheng
2012-11-21 21:13 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).