summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uslcom.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/uslcom.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/uslcom.c')
-rw-r--r--sys/dev/usb/uslcom.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 5c98b95a257..647222506f2 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.15 2007/10/08 03:10:42 jcs Exp $ */
+/* $OpenBSD: uslcom.c,v 1.16 2007/10/11 18:33:15 deraadt Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -168,14 +168,10 @@ uslcom_attach(struct device *parent, struct device *self, void *aux)
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
usbd_status error;
- char *devinfop;
int i;
bzero(&uca, sizeof(uca));
sc->sc_udev = uaa->device;
- devinfop = usbd_devinfo_alloc(uaa->device, 0);
- printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
- usbd_devinfo_free(devinfop);
if (usbd_set_config_index(sc->sc_udev, USLCOM_CONFIG_NO, 1) != 0) {
printf("%s: could not set configuration no\n",