summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_udav.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2007-10-11 18:33:13 +0000
committerderaadt <deraadt@openbsd.org>2007-10-11 18:33:13 +0000
commitfc5c6ac59ce5cbc022c1e83b8d45d511803eefc6 (patch)
treef48ba3f4f889ca73be80167ebfdbf26cc87597d9 /sys/dev/usb/if_udav.c
parentserialize usbd_probe_and_attach(); only let one usb device be match'd and (diff)
downloadwireguard-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/if_udav.c')
-rw-r--r--sys/dev/usb/if_udav.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 7a002a227a8..fc14f89137c 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.34 2007/06/14 10:11:15 mbalmer Exp $ */
+/* $OpenBSD: if_udav.c,v 1.35 2007/10/11 18:33:14 deraadt Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -194,17 +194,12 @@ udav_attach(struct device *parent, struct device *self, void *aux)
usbd_status err;
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
- char *devinfop;
char *devname = sc->sc_dev.dv_xname;
struct ifnet *ifp;
struct mii_data *mii;
u_char eaddr[ETHER_ADDR_LEN];
int i, s;
- devinfop = usbd_devinfo_alloc(dev, 0);
- printf("\n%s: %s", devname, devinfop);
- usbd_devinfo_free(devinfop);
-
/* Move the device into the configured state. */
err = usbd_set_config_no(dev, UDAV_CONFIG_NO, 1);
if (err) {