Module Name: src
Committed By: jakllsch
Date: Sun Aug 8 01:57:24 UTC 2010
Modified Files:
src/sys/dev/usb: if_cdce.c
Log Message:
Like some other USB devices, register cdce(4) with pmf(9).
Addresses PR#40949.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/usb/if_cdce.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_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.30 src/sys/dev/usb/if_cdce.c:1.31
--- src/sys/dev/usb/if_cdce.c:1.30 Wed May 19 21:10:42 2010
+++ src/sys/dev/usb/if_cdce.c Sun Aug 8 01:57:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.30 2010/05/19 21:10:42 jakllsch Exp $ */
+/* $NetBSD: if_cdce.c,v 1.31 2010/08/08 01:57:24 jakllsch Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.30 2010/05/19 21:10:42 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.31 2010/08/08 01:57:24 jakllsch Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
#endif
@@ -292,6 +292,9 @@
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->cdce_udev,
sc->cdce_dev);
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
+
return;
}
@@ -302,6 +305,9 @@
struct ifnet *ifp = GET_IFP(sc);
int s;
+ if (device_pmf_is_registered(self))
+ pmf_device_deregister(self);
+
s = splusb();
if (!sc->cdce_attached) {
