diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-10-11 18:33:13 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-10-11 18:33:13 +0000 |
| commit | fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6 (patch) | |
| tree | f48ba3f4f889ca73be80167ebfdbf26cc87597d9 /sys/dev/usb/uhub.c | |
| parent | serialize usbd_probe_and_attach(); only let one usb device be match'd and (diff) | |
| download | wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.tar.xz wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.zip | |
treat usb vendor/product names as a locator, and have usbd_print handle it,
so that it shows up before the :. as a result, all the usb devices do not
need to have name printing code anymore. all this now works and prints
nicely because usbd_probe_and_attach() is serialized. ok kettenis
Diffstat (limited to 'sys/dev/usb/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 9551bf12ea0..bccf103dc58 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.47 2007/06/14 10:11:16 mbalmer Exp $ */ +/* $OpenBSD: uhub.c,v 1.48 2007/10/11 18:33:15 deraadt Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -132,7 +132,6 @@ uhub_attach(struct device *parent, struct device *self, void *aux) struct uhub_softc *sc = (struct uhub_softc *)self; struct usb_attach_arg *uaa = aux; usbd_device_handle dev = uaa->device; - char *devinfop; usbd_status err; struct usbd_hub *hub = NULL; usb_device_request_t req; @@ -145,10 +144,6 @@ uhub_attach(struct device *parent, struct device *self, void *aux) DPRINTFN(1,("uhub_attach\n")); sc->sc_hub = dev; - devinfop = usbd_devinfo_alloc(dev, 0); - printf(": %s\n", devinfop); - usbd_devinfo_free(devinfop); - err = usbd_set_config_index(dev, 0, 1); if (err) { DPRINTF(("%s: configuration failed, error=%s\n", |