[src/trunk]: src/sys/dev/usb remember to call deregister.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2692ca734198
branches:  trunk
changeset: 330280:2692ca734198
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jul 02 20:17:30 2014 +0000

description:
remember to call deregister.

diffstat:

 sys/dev/usb/if_urtwn.c |  6 ++++--
 sys/dev/usb/uhid.c     |  6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 29a621f997bd -r 2692ca734198 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Wed Jul 02 19:49:38 2014 +0000
+++ b/sys/dev/usb/if_urtwn.c    Wed Jul 02 20:17:30 2014 +0000
@@ -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 @@
 
        DPRINTFN(DBG_FN, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
 
+       pmf_device_deregister(self);
+
        s = splusb();
 
        sc->sc_dying = 1;
diff -r 29a621f997bd -r 2692ca734198 sys/dev/usb/uhid.c
--- a/sys/dev/usb/uhid.c        Wed Jul 02 19:49:38 2014 +0000
+++ b/sys/dev/usb/uhid.c        Wed Jul 02 20:17:30 2014 +0000
@@ -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 @@
 
        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) {