aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-10-01 08:54:17 +0200
committerRobert Richter <robert.richter@amd.com>2010-10-01 08:54:17 +0200
commitef70fcc0cd5d98f5e2df82c9e598b47f351d4f66 (patch)
treeb801ba4d7ebb1155df68d530df49444ffa6252cc /drivers/input/input.c
parent4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb (diff)
parent98d943b02f6f1b57787ff1aa6f34d019a407e3ee (diff)
downloadkernel_samsung_crespo-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.zip
kernel_samsung_crespo-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.tar.gz
kernel_samsung_crespo-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.tar.bz2
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts: arch/arm/oprofile/common.c Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r--drivers/input/input.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index a9b025f..ab69820 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1599,11 +1599,14 @@ EXPORT_SYMBOL(input_free_device);
* @dev: input device supporting MT events and finger tracking
* @num_slots: number of slots used by the device
*
- * This function allocates all necessary memory for MT slot handling
- * in the input device, and adds ABS_MT_SLOT to the device capabilities.
+ * This function allocates all necessary memory for MT slot handling in the
+ * input device, and adds ABS_MT_SLOT to the device capabilities. All slots
+ * are initially marked as unused iby setting ABS_MT_TRACKING_ID to -1.
*/
int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots)
{
+ int i;
+
if (!num_slots)
return 0;
@@ -1614,6 +1617,10 @@ int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots)
dev->mtsize = num_slots;
input_set_abs_params(dev, ABS_MT_SLOT, 0, num_slots - 1, 0, 0);
+ /* Mark slots as 'unused' */
+ for (i = 0; i < num_slots; i++)
+ dev->mt[i].abs[ABS_MT_TRACKING_ID - ABS_MT_FIRST] = -1;
+
return 0;
}
EXPORT_SYMBOL(input_mt_create_slots);