summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2019-01-07 14:24:23 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2019-01-07 14:24:23 +0000
commit3cf51a51a73ddb7f2189d57d44c5136870127c6d (patch)
tree372120cc943a66bf06da91b2aa3ed34451de4b41 /sys/dev/usb
parent8131ad9fc6a1427327524af3cf3083a749c1fbf5 (diff)
Use the `iface' argument from the *attach() function instead of calling
usbd_device2interface_handle(). ok visa@
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/uhub.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index c4ee5c0f12a..272569798c9 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhub.c,v 1.91 2018/11/10 15:29:22 mpi Exp $ */
+/* $OpenBSD: uhub.c,v 1.92 2019/01/07 14:24:22 mpi Exp $ */
/* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
@@ -126,7 +126,7 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
usb_hub_ss_descriptor_t ss;
} hd;
int p, port, nports, powerdelay;
- struct usbd_interface *iface;
+ struct usbd_interface *iface = uaa->iface;
usb_endpoint_descriptor_t *ed;
struct usbd_tt *tts = NULL;
uint8_t ttthink = 0;
@@ -233,11 +233,6 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
}
/* Set up interrupt pipe. */
- err = usbd_device2interface_handle(dev, 0, &iface);
- if (err) {
- printf("%s: no interface handle\n", sc->sc_dev.dv_xname);
- goto bad;
- }
ed = usbd_interface2endpoint_descriptor(iface, 0);
if (ed == NULL) {
printf("%s: no endpoint descriptor\n", sc->sc_dev.dv_xname);