diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2013-11-15 08:25:32 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2013-11-15 08:25:32 +0000 |
| commit | 3ab67e413a613e17c0a2eb67b3dbf371317b313a (patch) | |
| tree | 18a1ece0f978eaee642125d0908130a245fb8291 /sys/dev/usb/ubsa.c | |
| parent | 19f5dcfcec57bffc7080845213bea362120f4c04 (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/ubsa.c')
| -rw-r--r-- | sys/dev/usb/ubsa.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 8de970dba89..52db4218839 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.58 2013/11/07 07:32:36 pirofti Exp $ */ +/* $OpenBSD: ubsa.c,v 1.59 2013/11/15 08:25:31 pirofti Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -396,16 +396,13 @@ int ubsa_activate(struct device *self, int act) { struct ubsa_softc *sc = (struct ubsa_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 |