summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcs <jcs@openbsd.org>2015-03-16 01:49:11 +0000
committerjcs <jcs@openbsd.org>2015-03-16 01:49:11 +0000
commit85697f65fcd1faeae04a4340f6ccbbd7671a70df (patch)
tree5dc458f6191dc6e40fecb08dfc7537dbebd4568e
parentsync (diff)
downloadwireguard-openbsd-85697f65fcd1faeae04a4340f6ccbbd7671a70df.tar.xz
wireguard-openbsd-85697f65fcd1faeae04a4340f6ccbbd7671a70df.zip
Revert 1.44 since we have found some machines where the keyboard
stops working after our aux port resets, which were not broken before. ok deraadt
-rw-r--r--sys/dev/ic/pckbc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 5b927bd82e9..ba16623fda0 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.45 2015/03/14 03:38:47 jsg Exp $ */
+/* $OpenBSD: pckbc.c,v 1.46 2015/03/16 01:49:11 jcs Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -277,12 +277,6 @@ pckbc_attach_slot(struct pckbc_softc *sc, pckbc_slot_t slot, int force)
if (t->t_slotdata[slot] == NULL)
return 0;
pckbc_init_slotdata(t->t_slotdata[slot]);
- } else if (!found && slot == PCKBC_AUX_SLOT) {
- u_char cmd[1] = { PMS_RESET };
-
- (void) pckbc_poll_cmd(t, PCKBC_AUX_SLOT, cmd, sizeof cmd,
- 0, NULL, 1);
- pckbc_slot_enable(t, PCKBC_AUX_SLOT, 0);
}
return (found);
}