Module Name: src
Committed By: christos
Date: Wed Jul 2 20:17:30 UTC 2014
Modified Files:
src/sys/dev/usb: if_urtwn.c uhid.c
Log Message:
remember to call deregister.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/usb/uhid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.30 src/sys/dev/usb/if_urtwn.c:1.31
--- src/sys/dev/usb/if_urtwn.c:1.30 Thu May 8 01:59:09 2014
+++ src/sys/dev/usb/if_urtwn.c Wed Jul 2 16:17:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.30 2014/05/08 05:59:09 mrg Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.31 2014/07/02 20:17:30 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.30 2014/05/08 05:59:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.31 2014/07/02 20:17:30 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -431,6 +431,8 @@ urtwn_detach(device_t self, int flags)
DPRINTFN(DBG_FN, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
+ pmf_device_deregister(self);
+
s = splusb();
sc->sc_dying = 1;
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.90 src/sys/dev/usb/uhid.c:1.91
--- src/sys/dev/usb/uhid.c:1.90 Sun Mar 16 01:20:29 2014
+++ src/sys/dev/usb/uhid.c Wed Jul 2 16:17:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.90 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: uhid.c,v 1.91 2014/07/02 20:17:30 christos Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.90 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.91 2014/07/02 20:17:30 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -219,6 +219,8 @@ uhid_detach(device_t self, int flags)
sc->sc_dying = 1;
+ pmf_device_deregister(self);
+
mutex_enter(&sc->sc_lock);
if (sc->sc_hdev.sc_state & UHIDEV_OPEN) {
if (--sc->sc_refcnt >= 0) {
