[src/trunk]: src/sys/dev/usb Dot't forget to deactivate subdevices.

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b2fead35d51b
branches:  trunk
changeset: 476282:b2fead35d51b
user:      augustss <augustss%NetBSD.org@localhost>
date:      Sun Sep 12 08:21:49 1999 +0000

description:
Dot't forget to deactivate subdevices.

diffstat:

 sys/dev/usb/ukbd.c |  7 +++++--
 sys/dev/usb/ums.c  |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 09cec6dbe021 -r b2fead35d51b sys/dev/usb/ukbd.c
--- a/sys/dev/usb/ukbd.c        Sun Sep 12 02:40:59 1999 +0000
+++ b/sys/dev/usb/ukbd.c        Sun Sep 12 08:21:49 1999 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ukbd.c,v 1.43 1999/09/05 19:32:18 augustss Exp $        */
+/*      $NetBSD: ukbd.c,v 1.44 1999/09/12 08:21:49 augustss Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -394,6 +394,7 @@
        enum devact act;
 {
        struct ukbd_softc *sc = (struct ukbd_softc *)self;
+       int rv = 0;
 
        switch (act) {
        case DVACT_ACTIVATE:
@@ -401,10 +402,12 @@
                break;
 
        case DVACT_DEACTIVATE:
+               if (sc->sc_wskbddev)
+                       rv = config_deactivate(sc->sc_wskbddev);
                sc->sc_dying = 1;
                break;
        }
-       return (0);
+       return (rv);
 }
 
 int
diff -r 09cec6dbe021 -r b2fead35d51b sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Sun Sep 12 02:40:59 1999 +0000
+++ b/sys/dev/usb/ums.c Sun Sep 12 08:21:49 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.31 1999/09/05 19:32:19 augustss Exp $        */
+/*     $NetBSD: ums.c,v 1.32 1999/09/12 08:21:49 augustss Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -301,6 +301,7 @@
        enum devact act;
 {
        struct ums_softc *sc = (struct ums_softc *)self;
+       int rv = 0;
 
        switch (act) {
        case DVACT_ACTIVATE:
@@ -308,10 +309,12 @@
                break;
 
        case DVACT_DEACTIVATE:
+               if (sc->sc_wsmousedev)
+                       rv = config_deactivate(sc->sc_wsmousedev);
                sc->sc_dying = 1;
                break;
        }
-       return (0);
+       return (rv);
 }
 
 int