d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use usbd_get_string() instead of calling usbd_get_string_desc()

Browse Source 
with the wrong language parameter when retrieving the device serial
number. This invalid request caused some devices not to work at
all.

PR:		usb/79190
Submitted by:	Hans Petter Selasky <hselasky@c2i.net>
This commit is contained in:
Ian Dowse 2005-03-25 01:44:38 +00:00
parent 8a9cf808e6
commit e2b66de827
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/usb/uhub.c
View File

@ -664,13 +664,11 @@ uhub_child_pnpinfo_str(device_t cbdev, device_t child, char *buf,
struct uhub_softc *sc = device_get_softc(cbdev);
usbd_device_handle devhub = sc->sc_hub;
usbd_device_handle dev;
usb_string_descriptor_t us;
struct usbd_interface *iface;
char serial[128];
int nports;
int port;
int i, j, size;
int err;
int i;
nports = devhub->hub->hubdesc.bNbrPorts;
for (port = 0; port < nports; port++) {
@ -688,18 +686,8 @@ uhub_child_pnpinfo_str(device_t cbdev, device_t child, char *buf,
return (0);
found_dev:
j = 0;
if (dev->ddesc.iSerialNumber != 0) {
err = usbd_get_string_desc(dev, dev->ddesc.iSerialNumber, 0,
&us, &size);
if (err == 0) {
do {
serial[j] = UGETW(us.bString[j]);
j++;
} while (j < ((us.bLength - 2) / 2));
}
}
serial[j] = '\0';
serial[0] = '\0';
(void)usbd_get_string(dev, dev->ddesc.iSerialNumber, &serial[0]);
if (dev->ifacenums == NULL) {
snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
"devclass=0x%02x devsubclass=0x%02x "