summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2007-11-04 05:52:36 +0000
committerderaadt <deraadt@openbsd.org>2007-11-04 05:52:36 +0000
commit73c80aca0580336b0f21beb1ceee38df99877372 (patch)
treeb170a7fa7f6db76474ba7fb0380eb7fdfef4809b /sys
parentsome small nonfunctional tweaks. ok beck millert (diff)
downloadwireguard-openbsd-73c80aca0580336b0f21beb1ceee38df99877372.tar.xz
wireguard-openbsd-73c80aca0580336b0f21beb1ceee38df99877372.zip
improve/repair locator printing; ok jsg
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usb_subr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 6bb4c77701b..cda20113d4a 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_subr.c,v 1.63 2007/10/11 18:33:15 deraadt Exp $ */
+/* $OpenBSD: usb_subr.c,v 1.64 2007/11/04 05:52:36 deraadt Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -1183,7 +1183,7 @@ usbd_print(void *aux, const char *pnp)
usbd_devinfo_free(devinfop);
return (QUIET);
}
- printf("%s, %s", devinfop, pnp);
+ printf("%s at %s", devinfop, pnp);
}
if (uaa->port != 0)
printf(" port %d", uaa->port);
@@ -1192,8 +1192,8 @@ usbd_print(void *aux, const char *pnp)
if (uaa->ifaceno != UHUB_UNK_INTERFACE)
printf(" interface %d", uaa->ifaceno);
- /* Display device info string */
- printf(" %s\n", devinfop);
+ if (!pnp)
+ printf(" %s\n", devinfop);
usbd_devinfo_free(devinfop);
return (UNCONF);
}