|
@@ -1516,6 +1516,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid,
|
|
struct hid_input *hidinput = kzalloc(sizeof(*hidinput), GFP_KERNEL);
|
|
struct hid_input *hidinput = kzalloc(sizeof(*hidinput), GFP_KERNEL);
|
|
struct input_dev *input_dev = input_allocate_device();
|
|
struct input_dev *input_dev = input_allocate_device();
|
|
const char *suffix = NULL;
|
|
const char *suffix = NULL;
|
|
|
|
+ size_t suffix_len, name_len;
|
|
|
|
|
|
if (!hidinput || !input_dev)
|
|
if (!hidinput || !input_dev)
|
|
goto fail;
|
|
goto fail;
|
|
@@ -1559,10 +1560,15 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid,
|
|
}
|
|
}
|
|
|
|
|
|
if (suffix) {
|
|
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);
|
|
input_set_drvdata(input_dev, hid);
|