summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uslcom.c
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2013-11-15 08:25:32 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2013-11-15 08:25:32 +0000
commit3ab67e413a613e17c0a2eb67b3dbf371317b313a (patch)
tree18a1ece0f978eaee642125d0908130a245fb8291 /sys/dev/usb/uslcom.c
parent19f5dcfcec57bffc7080845213bea362120f4c04 (diff)
Sort-out activate functionality for ucom(4) and it's parents.
The child should not have to call the parent for deactivation. The parent should handle it. So kill the activate routine in ucom(4) and adapt the parents to no longer call it. Also remove sc_dying in ucom(4) and use usbd_is_dying() instead. Okay mpi@.
Diffstat (limited to 'sys/dev/usb/uslcom.c')
-rw-r--r--sys/dev/usb/uslcom.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 782ce69dfff..eae0879c937 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.29 2013/11/07 10:34:02 pirofti Exp $ */
+/* $OpenBSD: uslcom.c,v 1.30 2013/11/15 08:25:31 pirofti Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -338,16 +338,13 @@ int
uslcom_activate(struct device *self, int act)
{
struct uslcom_softc *sc = (struct uslcom_softc *)self;
- int rv = 0;
switch (act) {
case DVACT_DEACTIVATE:
- if (sc->sc_subdev != NULL)
- rv = config_deactivate(sc->sc_subdev);
usbd_deactivate(sc->sc_udev);
break;
}
- return (rv);
+ return (0);
}
int