summaryrefslogtreecommitdiff
path: root/sys/dev/pckbc
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2009-11-23 01:33:09 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2009-11-23 01:33:09 +0000
commitd35f3535dd91e047e8d26d34438cc4e0a6b1666d (patch)
tree16169bb42088aa668322c33c05e9463783538d7e /sys/dev/pckbc
parenta25a111db6a5fdbc1444fb27ec537c4393c713d7 (diff)
Fix pckbd and acpihpet suspend/resume cases to fit with the future framework
that's going to get in really soon. Okay mlarkin@, deraadt@.
Diffstat (limited to 'sys/dev/pckbc')
-rw-r--r--sys/dev/pckbc/pckbd.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 6a4c833fc57..907a5f76262 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.21 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: pckbd.c,v 1.22 2009/11/23 01:33:08 pirofti Exp $ */
/* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -418,13 +418,11 @@ int
pckbd_activate(struct device *self, int act)
{
switch (act) {
- case DVACT_ACTIVATE:
- if (!cold)
- pckbd_enable(self, 1);
+ case DVACT_RESUME:
+ pckbd_enable(self, 1);
break;
- case DVACT_DEACTIVATE:
- if (!cold)
- pckbd_enable(self, 0);
+ case DVACT_SUSPEND:
+ pckbd_enable(self, 0);
break;
}
return (0);