diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 11:41:58 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 11:41:58 -0400 |
commit | 5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d (patch) | |
tree | 819d3f27a826f29210398615f4918a4cd9154836 /drivers/input/tablet/wacom_wac.c | |
parent | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (diff) | |
parent | 6ac8a99b906b01eaceef0057dbee4a225a32c423 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index ce0b4608dad9..40d77ba8fdc1 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
@@ -687,10 +687,10 @@ static void wacom_tpc_finger_in(struct wacom_wac *wacom, char *data, int idx) | |||
687 | * protocol. | 687 | * protocol. |
688 | */ | 688 | */ |
689 | if (wacom->last_finger != finger) { | 689 | if (wacom->last_finger != finger) { |
690 | if (x == input->abs[ABS_X]) | 690 | if (x == input_abs_get_val(input, ABS_X)) |
691 | x++; | 691 | x++; |
692 | 692 | ||
693 | if (y == input->abs[ABS_Y]) | 693 | if (y == input_abs_get_val(input, ABS_Y)) |
694 | y++; | 694 | y++; |
695 | } | 695 | } |
696 | 696 | ||