diff options
author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2018-02-17 12:38:46 +0000 |
---|---|---|
committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2018-02-17 12:38:46 +0000 |
commit | 171164e50d61a04cdf62abc8093bc33e470e6ba6 (patch) | |
tree | 7e26231ad17d008d6ffe175b178feb0437ad575f /sys | |
parent | 2ad275d20f820797c36d7e75090d04e260fd8b12 (diff) | |
download | src-171164e50d61a04cdf62abc8093bc33e470e6ba6.tar.gz src-171164e50d61a04cdf62abc8093bc33e470e6ba6.zip |
Revert redundant parts of r329440 after recent devmatch(8) changes.
Sponsored by: Mellanox Technologies
Notes
Notes:
svn path=/head/; revision=329454
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/usb_hub.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index f42c30e9a86c..59d56e656979 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -1733,12 +1733,7 @@ uhub_child_pnpinfo_string(device_t parent, device_t child, } iface = usbd_get_iface(res.udev, res.iface_index); if (iface && iface->idesc) { - snprintf(buf, buflen, - "bus=usb " -#if USB_HAVE_UGEN - "device=%s " -#endif - "vendor=0x%04x product=0x%04x " + snprintf(buf, buflen, "vendor=0x%04x product=0x%04x " "devclass=0x%02x devsubclass=0x%02x " "devproto=0x%02x " "sernum=\"%s\" " @@ -1746,9 +1741,6 @@ uhub_child_pnpinfo_string(device_t parent, device_t child, "mode=%s " "intclass=0x%02x intsubclass=0x%02x " "intprotocol=0x%02x" "%s%s", -#if USB_HAVE_UGEN - res.udev->ugen_name, -#endif UGETW(res.udev->ddesc.idVendor), UGETW(res.udev->ddesc.idProduct), res.udev->ddesc.bDeviceClass, |