summaryrefslogtreecommitdiff
path: root/sys/dev/usb/udl.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-06 21:03:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-06 21:03:06 +0000
commitdde7b00df07d5064317db5ff355091c989d5d684 (patch)
tree7ea38e550451394317b7581ff5f8914bd269ec95 /sys/dev/usb/udl.c
parent236f5968eef75c8e14b0b020bb15cc2f53b5041e (diff)
Add a DVACT_WAKEUP op to the *_activate() API. This is called after the
kernel resumes normal (non-cold, able to run processes, etc) operation. Previously we were relying on specific DVACT_RESUME op's in drivers creating callback/threads themselves, but that has become too common, indicating the need for a built-in mechanism. ok dlg kettenis, tested by a sufficient amount of people
Diffstat (limited to 'sys/dev/usb/udl.c')
-rw-r--r--sys/dev/usb/udl.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index cf00953178a..c34ad7721f9 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udl.c,v 1.78 2013/10/21 10:36:26 miod Exp $ */
+/* $OpenBSD: udl.c,v 1.79 2013/12/06 21:03:05 deraadt Exp $ */
/*
* Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -487,16 +487,15 @@ int
udl_activate(struct device *self, int act)
{
struct udl_softc *sc = (struct udl_softc *)self;
- int ret = 0;
+ int rv;
switch (act) {
case DVACT_DEACTIVATE:
usbd_deactivate(sc->sc_udev);
break;
}
- ret = config_activate_children(self, act);
-
- return (ret);
+ rv = config_activate_children(self, act);
+ return (rv);
}
/* ---------- */