Module Name: src
Committed By: snj
Date: Sun Mar 15 22:47:55 UTC 2015
Modified Files:
src/sys/dev/usb [netbsd-7]: if_run.c
Log Message:
Pull up following revision(s) (requested by nonakap in ticket #592):
sys/dev/usb/if_run.c: revision 1.11
Add pmf hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/dev/usb/if_run.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_run.c
diff -u src/sys/dev/usb/if_run.c:1.10 src/sys/dev/usb/if_run.c:1.10.4.1
--- src/sys/dev/usb/if_run.c:1.10 Tue Jan 28 13:08:13 2014
+++ src/sys/dev/usb/if_run.c Sun Mar 15 22:47:55 2015
@@ -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 @@ run_attach(device_t parent, device_t sel
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 @@ run_detach(device_t self, int flags)
if (ifp->if_softc == NULL)
return (0);
+ pmf_device_deregister(self);
+
s = splnet();
sc->sc_flags |= RUN_DETACHING;
