summaryrefslogtreecommitdiff
path: root/sys/dev/pci/pccbb.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-08 17:56:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-08 17:56:17 +0000
commit7a1bbcf3edc6226b4bbb0ea19002a8f17114094b (patch)
treeebffa007f48b424a07781a75825c16946db06ee7 /sys/dev/pci/pccbb.c
parentd1d28ad02601e231dcc0722c3434a379e8ffa01e (diff)
Document that the resume case is waking children which may have been
ejected, and that this needs to be solved.
Diffstat (limited to 'sys/dev/pci/pccbb.c')
-rw-r--r--sys/dev/pci/pccbb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index b6c65d81d53..5b24b6ea56d 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.84 2010/09/08 17:54:37 deraadt Exp $ */
+/* $OpenBSD: pccbb.c,v 1.85 2010/09/08 17:56:16 deraadt Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -2884,6 +2884,11 @@ pccbbactivate(struct device *self, int act)
/* re-check all cards */
pccbb_checksockstat(sc);
+ /*
+ * XXX Because the cardslot stuff is so obfuscated with threads,
+ * here we are activating children which may have been
+ * ejected while we were asleep. This needs to be solved.
+ */
rv = config_activate_children(self, act);
sc->sc_pil_intr_enable = 1;