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/if_url.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/if_url.c')
| -rw-r--r-- | sys/dev/usb/if_url.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index d49b4f9cffd..6c45ad8e1f3 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.48 2007/06/14 10:11:15 mbalmer Exp $ */ +/* $OpenBSD: if_url.c,v 1.49 2007/10/11 18:33:14 deraadt Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -196,17 +196,12 @@ url_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\n", devname, devinfop); - usbd_devinfo_free(devinfop); - /* Move the device into the configured state. */ err = usbd_set_config_no(dev, URL_CONFIG_NO, 1); if (err) { |