diff options
| author |   mpi <mpi@openbsd.org> | 2012-05-15 12:52:44 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2012-05-15 12:52:44 +0000 |
| commit | 5816f59f8be0439aa95c2031e09d1de2a6c88f46 (patch) | |
| tree | 608f8f1f03f396e14191d9f25c8b9b61bb63ebff | |
| parent | Don't use a pointer to an opaque softc, we'll need to access its unit (diff) | |
| download | wireguard-openbsd-5816f59f8be0439aa95c2031e09d1de2a6c88f46.tar.xz wireguard-openbsd-5816f59f8be0439aa95c2031e09d1de2a6c88f46.zip | |
Set the usb(4) unit number as bus number. This fixes a possible
conflict where machines with two controllers with the same unit
number (i.e. ehci0 and uhci0) would have reported to buses 0.
ok miod@
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 067617f1d58..27e9f825d06 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.81 2012/01/08 13:12:38 miod Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.82 2012/05/15 12:52:44 mpi 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 $ */ @@ -1356,7 +1356,7 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di, struct usbd_port *p; int i, err, s; - di->udi_bus = dev->bus->bdev.dv_unit; + di->udi_bus = dev->bus->usbctl->dv_unit; di->udi_addr = dev->address; usbd_devinfo_vp(dev, di->udi_vendor, sizeof(di->udi_vendor), di->udi_product, sizeof(di->udi_product), usedev); |