summaryrefslogtreecommitdiff
path: root/sys/dev/usb/ubt.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/ubt.c')
-rw-r--r--sys/dev/usb/ubt.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index 5ee08bff855..c90a6814b15 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubt.c,v 1.4 2007/06/06 19:25:49 mk Exp $ */
+/* $OpenBSD: ubt.c,v 1.5 2007/06/10 10:53:48 mbalmer Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -425,7 +425,7 @@ ubt_attach(struct device *parent, struct device *self, void *aux)
hci_attach(&sc->sc_unit);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
- USBDEV(sc->sc_dev));
+ &sc->sc_dev);
sc->sc_ok = 1;
@@ -460,12 +460,12 @@ ubt_detach(struct device *self, int flags)
/* wait for all processes to finish */
s = splusb();
if (sc->sc_refcnt-- > 0)
- usb_detach_wait(USBDEV(sc->sc_dev));
+ usb_detach_wait(&sc->sc_dev);
splx(s);
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
- USBDEV(sc->sc_dev));
+ &sc->sc_dev);
DPRINTFN(1, "driver detached\n");
@@ -917,7 +917,7 @@ ubt_xmit_cmd_complete(usbd_xfer_handle xfer,
if (--sc->sc_refcnt < 0) {
DPRINTF("sc_refcnt=%d\n", sc->sc_refcnt);
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(&sc->sc_dev);
return;
}
@@ -1012,7 +1012,7 @@ ubt_xmit_acl_complete(usbd_xfer_handle xfer,
unit->hci_flags &= ~BTF_XMIT_ACL;
if (--sc->sc_refcnt < 0) {
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(&sc->sc_dev);
return;
}
@@ -1159,7 +1159,7 @@ ubt_xmit_sco_complete(usbd_xfer_handle xfer,
}
if (--sc->sc_refcnt < 0) {
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(&sc->sc_dev);
return;
}
@@ -1296,7 +1296,7 @@ ubt_recv_acl_complete(usbd_xfer_handle xfer,
if (--sc->sc_refcnt < 0) {
DPRINTF("refcnt = %d\n", sc->sc_refcnt);
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(&sc->sc_dev);
return;
}
@@ -1389,7 +1389,7 @@ ubt_recv_sco_complete(usbd_xfer_handle xfer,
if (--sc->sc_refcnt < 0) {
DPRINTF("refcnt=%d\n", sc->sc_refcnt);
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(&sc->sc_dev);
return;
}