summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2012-03-12 22:15:43 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-12 22:19:14 -0700
commit24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (patch)
treefe7d980253335a2e21a3983be97c79133a9ebbee /drivers/input
parent7a0a1dfe9b319528ef8f681d610b8a49797ab475 (diff)
Input: wacom - fix physical size calculation for 3rd-gen Bamboo
This calculation determines the physical dimensions of the tablet, used later on in calculate_touch_res to obtain the touch sensor resolution. Instead of dividing the logical size by the resolution, the current code performs a multiplication. This doesn't pose a problem for the 3rd-gen Bamboo since the resolution and scale factor happen to be identical, but will produce an incorrect result for other cases. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_sys.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 7e63183a6c68..b59058998417 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -184,9 +184,9 @@ static int wacom_parse_logical_collection(unsigned char *report,
* data before its overwritten.
*/
features->x_phy =
- (features->x_max * features->x_resolution) / 100;
+ (features->x_max * 100) / features->x_resolution;
features->y_phy =
- (features->y_max * features->y_resolution) / 100;
+ (features->y_max * 100) / features->y_resolution;
features->x_max = features->y_max =
get_unaligned_le16(&report[10]);