diff options
| author | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-12-03 08:41:24 +0000 |
|---|---|---|
| committer | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-12-03 08:41:24 +0000 |
| commit | fe0d408987b42b531420ff2de76d534dbe7ecee7 (patch) | |
| tree | 6196b778a0e888c9c44157e090059018b00a3080 /sys/dev/usb | |
| parent | b06e7af6ddadc3933a558d3e3ab7c76125611445 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ohci_pci.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/uhci_pci.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c index 8e1378b813e51..f8c49641efcfd 100644 --- a/sys/dev/usb/ohci_pci.c +++ b/sys/dev/usb/ohci_pci.c @@ -168,7 +168,8 @@ ohci_pci_attach(device_t self) return ENOMEM; } - usbus = device_add_child(self, "usb", -1, sc); + usbus = device_add_child(self, "usb", -1); + device_set_ivars(usbus, sc); if (!usbus) { device_printf(self, "could not add USB device\n"); return ENOMEM; diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index 9285174b07c84..0857f1683fcd9 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -181,7 +181,8 @@ uhci_pci_attach(device_t self) return ENOMEM; } - usbus = device_add_child(self, "usb", -1, sc); + usbus = device_add_child(self, "usb", -1); + device_set_ivars(usbus, sc); if (!usbus) { device_printf(self, "could not add USB device\n"); return ENOMEM; diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 0aedc62386459..46c2e8b0ac996 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -747,7 +747,8 @@ usbd_probe_and_attach(parent, dev, port, addr) * during probe and attach. Should be changed however. */ device_t bdev; - bdev = device_add_child(parent, NULL, -1, &uaa); + bdev = device_add_child(parent, NULL, -1); + device_set_ivars(bdev, &uaa); if (!bdev) { printf("%s: Device creation failed\n", USBDEVNAME(dev->bus->bdev)); return (USBD_INVAL); @@ -828,8 +829,9 @@ usbd_probe_and_attach(parent, dev, port, addr) ifaces[i] = 0; /* consumed */ #if defined(__FreeBSD__) - /* create another child for the next iface */ - bdev = device_add_child(parent, NULL, -1,&uaa); + /* create another device for the next iface */ + bdev = device_add_child(parent, NULL, -1); + device_set_ivars(bdev, &uaa); if (!bdev) { printf("%s: Device creation failed\n", USBDEVNAME(dev->bus->bdev)); |