Skip to content

L
linux
Commit e0fcd3bc authored by Brad Hards's avatar Brad Hards Committed by Vojtech Pavlik
Browse files
Options

Better naming for USB input devices that omit the manufacturer name.

parent b512cdf9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/usb/input/hid-core.c
View file @ e0fcd3bc
...@@ -1469,6 +1469,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) ...@@ -1469,6 +1469,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
strcat(hid->name, buf); strcat(hid->name, buf);
if (usb_string(dev, dev->descriptor.iProduct, buf, 64) > 0) if (usb_string(dev, dev->descriptor.iProduct, buf, 64) > 0)
snprintf(hid->name, 64, "%s %s", hid->name, buf); snprintf(hid->name, 64, "%s %s", hid->name, buf);
} else if (usb_string(dev, dev->descriptor.iProduct, buf, 128) > 0) {
snprintf(hid->name, 128, "%s", buf);
} else } else
snprintf(hid->name, 128, "%04x:%04x", dev->descriptor.idVendor, dev->descriptor.idProduct); snprintf(hid->name, 128, "%04x:%04x", dev->descriptor.idVendor, dev->descriptor.idProduct);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7