[src/netbsd-7]: src/sys/dev/usb Pull up following revision(s) (requested by n...

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

details:   https://anonhg.NetBSD.org/src/rev/96c7ac26dbb4
branches:  netbsd-7
changeset: 799085:96c7ac26dbb4
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Mar 15 22:47:55 2015 +0000

description:
Pull up following revision(s) (requested by nonakap in ticket #592):
        sys/dev/usb/if_run.c: revision 1.11
Add pmf hooks.

diffstat:

 sys/dev/usb/if_run.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 31998307dc7a -r 96c7ac26dbb4 sys/dev/usb/if_run.c
--- a/sys/dev/usb/if_run.c      Sun Mar 15 22:46:38 2015 +0000
+++ b/sys/dev/usb/if_run.c      Sun Mar 15 22:47:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_run.c,v 1.10 2014/01/28 13:08:13 martin Exp $       */
+/*     $NetBSD: if_run.c,v 1.10.4.1 2015/03/15 22:47:55 snj Exp $      */
 /*     $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10 2014/01/28 13:08:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.4.1 2015/03/15 22:47:55 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -662,6 +662,9 @@
        ieee80211_announce(ic);
 
        usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
+
+       if (!pmf_device_register(self, NULL, NULL))
+               aprint_error_dev(self, "couldn't establish power handler\n");
 }
 
 static int
@@ -675,6 +678,8 @@
        if (ifp->if_softc == NULL)
                return (0);
 
+       pmf_device_deregister(self);
+
        s = splnet();
 
        sc->sc_flags |= RUN_DETACHING;