diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2008-11-22 04:42:59 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2008-11-22 04:42:59 +0000 |
| commit | ee43d395f23778051691eb4bfc357fa8a319dc36 (patch) | |
| tree | 39f64994e1dc4a1a4688f1cd259f7a4ac2a1fa41 /sys/dev/usb/ubt.c | |
| parent | 40b98550b7357a09aad4dfe870e508bc05f03705 (diff) | |
Sync bluetooth with NetBSD
Diffstat (limited to 'sys/dev/usb/ubt.c')
| -rw-r--r-- | sys/dev/usb/ubt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index a929075b84f..3d6f68141ce 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ubt.c,v 1.13 2008/07/10 13:48:54 mbalmer Exp $ */ -/* $NetBSD: ubt.c,v 1.30 2007/12/16 19:01:37 christos Exp $ */ +/* $OpenBSD: ubt.c,v 1.14 2008/11/22 04:42:58 uwe Exp $ */ +/* $NetBSD: ubt.c,v 1.35 2008/07/28 14:19:26 drochner Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -449,6 +449,7 @@ ubt_attach(struct device *parent, struct device *self, void *aux) &sc->sc_dev); sc->sc_ok = 1; + /* XXX pmf_device_deregister in NetBSD (power hook) */ } int @@ -459,6 +460,8 @@ ubt_detach(struct device *self, int flags) DPRINTF("sc=%p flags=%d\n", sc, flags); + /* XXX pmf_device_deregister in NetBSD (power hook) */ + sc->sc_dying = 1; if (!sc->sc_ok) @@ -718,7 +721,6 @@ ubt_abortdealloc(struct ubt_softc *sc) * * Bluetooth Unit/USB callbacks * - * All of this will be called at the IPL_ we specified above */ int ubt_enable(struct device *self) |