On Mon, Jun 30, 2014 at 2:46 PM, Jason Gerecke <[email protected]> wrote:
> Signed-off-by: Jason Gerecke <[email protected]>
> ---
>  drivers/input/tablet/wacom_wac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c 
> b/drivers/input/tablet/wacom_wac.c
> index 977d05c..61a45a5 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1093,7 +1093,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom)
>                 input_report_key(input, BTN_STYLUS2, data[1] & 0x10);
>                 input_report_abs(input, ABS_X, le16_to_cpup((__le16 
> *)&data[2]));
>                 input_report_abs(input, ABS_Y, le16_to_cpup((__le16 
> *)&data[4]));
> -               input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x03) << 8) 
> | data[6]);
> +               input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) 
> | data[6]);
>                 input_report_key(input, BTN_TOUCH, data[1] & 0x05);
>                 input_report_key(input, wacom->tool[0], prox);
>                 return 1;
> --
> 2.0.0
>

Just making sure these two patches don't get lost in all the work
Benjamin's doing. They're going to conflict, so depending on the
timeline for merging his patches, we can either push these up now(ish)
or I'll rebase afterwards.

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one  /
(That is to say, eight) to the two,     /
But you can’t take seven from three,    /
So you look at the sixty-fours....
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to