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/umass.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/umass.c')
| -rw-r--r-- | sys/dev/usb/umass.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 0752071aeae..7190b386374 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.53 2007/09/15 19:22:18 bluhm Exp $ */ +/* $OpenBSD: umass.c,v 1.54 2007/10/11 18:33:15 deraadt Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -317,14 +317,9 @@ umass_attach(struct device *parent, struct device *self, void *aux) usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; const char *sWire, *sCommand; - char *devinfop; usbd_status err; int i, bno, error; - devinfop = usbd_devinfo_alloc(uaa->device, 0); - printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop); - usbd_devinfo_free(devinfop); - sc->sc_udev = uaa->device; sc->sc_iface = uaa->iface; sc->sc_ifaceno = uaa->ifaceno; |