Module Name: src
Committed By: nonaka
Date: Fri Jan 29 04:38:18 UTC 2021
Modified Files:
src/sys/dev/hyperv: hvkbd.c
Log Message:
hvkbd(4): Don't wait forever.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/hyperv/hvkbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.6 src/sys/dev/hyperv/hvkbd.c:1.7
--- src/sys/dev/hyperv/hvkbd.c:1.6 Fri Nov 22 12:40:07 2019
+++ src/sys/dev/hyperv/hvkbd.c Fri Jan 29 04:38:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $ */
+/* $NetBSD: hvkbd.c,v 1.7 2021/01/29 04:38:18 nonaka Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.7 2021/01/29 04:38:18 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,7 +350,8 @@ hvkbd_connect(struct hvkbd_softc *sc)
hvkbd_intr(sc);
splx(s);
} else
- tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
+ tsleep(sc, PRIBIO | PCATCH, "hvkbdcon",
+ uimax(1, mstohz(1)));
} while (--timo > 0 && sc->sc_connected == 0);
if (timo == 0 && sc->sc_connected == 0) {
