Skip to content

HID: usbhid: Insert USB bus/device ID into HID name #7061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+13 −4
Closed

HID: usbhid: Insert USB bus/device ID into HID name #7061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions drivers/hid/usbhid/hid-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,8 @@ bool hid_is_usb(const struct hid_device *hdev)
}
EXPORT_SYMBOL_GPL(hid_is_usb);

#define USB_HID_NAME_PREFIX "usb-"

static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id)
{
struct usb_host_interface *interface = intf->cur_altsetting;
Expand Down Expand Up @@ -1394,17 +1396,24 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
else if (intf->cur_altsetting->desc.bInterfaceProtocol == 0)
hid->type = HID_TYPE_USBNONE;

if (dev->manufacturer)
strscpy(hid->name, dev->manufacturer, sizeof(hid->name));
snprintf(hid->name, sizeof(hid->name), "%s%s ", USB_HID_NAME_PREFIX,
dev_name(&dev->dev));

if (dev->manufacturer) {
strlcat(hid->name, dev->manufacturer, sizeof(hid->name));
}

if (dev->product) {
if (dev->manufacturer)
strlcat(hid->name, " ", sizeof(hid->name));
strlcat(hid->name, dev->product, sizeof(hid->name));
}

if (!strlen(hid->name))
snprintf(hid->name, sizeof(hid->name), "HID %04x:%04x",
if (strlen(hid->name) == strlen(dev_name(&dev->dev)) +
strlen(USB_HID_NAME_PREFIX) + 1)
snprintf(hid->name, sizeof(hid->name), "%s%s HID %04x:%04x",
USB_HID_NAME_PREFIX,
dev_name(&dev->dev),
le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct));

Expand Down