summaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_upl.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-11 18:33:16 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-11 18:33:16 +0000
commitc8d027b7c2c9478cc6134a64ce7f4493c4f31d03 (patch)
treed059b171ccae4a9b91e72ce31662e4163fb1e943 /sys/dev/usb/if_upl.c
parentcb538c3cbe26e67bac2b85c75da7259a005d264e (diff)
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_upl.c')
-rw-r--r--sys/dev/usb/if_upl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 806d079e3df..46618ea306c 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.39 2007/09/17 01:40:38 fgsch Exp $ */
+/* $OpenBSD: if_upl.c,v 1.40 2007/10/11 18:33:14 deraadt Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -235,7 +235,6 @@ upl_attach(struct device *parent, struct device *self, void *aux)
{
struct upl_softc *sc = (struct upl_softc *)self;
struct usb_attach_arg *uaa = aux;
- char *devinfop;
int s;
usbd_device_handle dev = uaa->device;
usbd_interface_handle iface;
@@ -247,10 +246,6 @@ upl_attach(struct device *parent, struct device *self, void *aux)
DPRINTFN(5,(" : upl_attach: sc=%p, dev=%p", sc, dev));
- devinfop = usbd_devinfo_alloc(dev, 0);
- printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
- usbd_devinfo_free(devinfop);
-
err = usbd_set_config_no(dev, UPL_CONFIG_NO, 1);
if (err) {
printf("%s: setting config no failed\n",