From 3ab67e413a613e17c0a2eb67b3dbf371317b313a Mon Sep 17 00:00:00 2001 From: Paul Irofti Date: Fri, 15 Nov 2013 08:25:32 +0000 Subject: 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@. --- sys/dev/usb/umsm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sys/dev/usb/umsm.c') diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index d76e52568d6..755c3d83bac 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.93 2013/11/07 10:34:20 pirofti Exp $ */ +/* $OpenBSD: umsm.c,v 1.94 2013/11/15 08:25:31 pirofti Exp $ */ /* * Copyright (c) 2008 Yojiro UO @@ -436,16 +436,13 @@ int umsm_activate(struct device *self, int act) { struct umsm_softc *sc = (struct umsm_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 -- cgit v1.2.3