summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2015-09-28 16:22:17 +0200
committerJiri Kosina <jkosina@suse.cz>2015-09-29 12:08:17 +0200
commitdc425a1c8c02b45fbab8b3ba522649d238cf84db (patch)
tree21db563d7dbc86ae6a5e746a6603ea7f4c66c015 /drivers/hid
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
downloadlinux-dc425a1c8c02b45fbab8b3ba522649d238cf84db.tar.xz
linux-dc425a1c8c02b45fbab8b3ba522649d238cf84db.zip
HID: multitouch: Add suffix for HID_DG_TOUCHPAD
Instead of printing "UNKNOWN" as device suffix for HID_DG_TOUCHPAD call the device as "Touchpad". Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-multitouch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 426b2f1a3450..661b4fce1a5d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -968,6 +968,9 @@ static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
case HID_DG_TOUCHSCREEN:
/* we do not set suffix = "Touchscreen" */
break;
+ case HID_DG_TOUCHPAD:
+ suffix = "Touchpad";
+ break;
case HID_GD_SYSTEM_CONTROL:
suffix = "System Control";
break;