| Message ID | 1353523360-6431-1-git-send-email-pingc@wacom.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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.
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);
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(-)