diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2018-09-04 15:31:13 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-09-04 21:32:24 +0200 |
| commit | d7065620b89fcc183caa6fa6ea36de5e01211137 (patch) | |
| tree | 051c42510ccaafc952deff200f010f7f1ceeb6f1 /drivers/hid/hid-input.c | |
| parent | 71f6fa90a353605bf25c36417c9ae529ac1a9a8d (diff) | |
| download | lwn-d7065620b89fcc183caa6fa6ea36de5e01211137.tar.gz lwn-d7065620b89fcc183caa6fa6ea36de5e01211137.zip | |
HID: input: do not append a suffix if the name already has it
Or it creates some weird input names like:
"MI Dongle MI Wireless Mouse Mouse"
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 4e94ea3e280a..83755ba33ef4 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1516,6 +1516,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, struct hid_input *hidinput = kzalloc(sizeof(*hidinput), GFP_KERNEL); struct input_dev *input_dev = input_allocate_device(); const char *suffix = NULL; + size_t suffix_len, name_len; if (!hidinput || !input_dev) goto fail; @@ -1559,10 +1560,15 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, } if (suffix) { - hidinput->name = kasprintf(GFP_KERNEL, "%s %s", - hid->name, suffix); - if (!hidinput->name) - goto fail; + name_len = strlen(hid->name); + suffix_len = strlen(suffix); + if ((name_len < suffix_len) || + strcmp(hid->name + name_len - suffix_len, suffix)) { + hidinput->name = kasprintf(GFP_KERNEL, "%s %s", + hid->name, suffix); + if (!hidinput->name) + goto fail; + } } input_set_drvdata(input_dev, hid); |