diff options
| author |   kettenis <kettenis@openbsd.org> | 2019-06-15 14:15:12 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2019-06-15 14:15:12 +0000 |
| commit | f51a09a398bd9f0162b820e92df2cade930dfa07 (patch) | |
| tree | 9e73ac467bfa8ca134c9d06cb43bf46c52e50174 /sys/dev/fdt/imxuart.c | |
| parent | Print domain key type in config test mode (-n). (diff) | |
| download | wireguard-openbsd-f51a09a398bd9f0162b820e92df2cade930dfa07.tar.xz wireguard-openbsd-f51a09a398bd9f0162b820e92df2cade930dfa07.zip | |
Fix previous commit and unbreak the tree.
Diffstat (limited to 'sys/dev/fdt/imxuart.c')
| -rw-r--r-- | sys/dev/fdt/imxuart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/fdt/imxuart.c b/sys/dev/fdt/imxuart.c index 6fabfe9c9f4..1418c90af09 100644 --- a/sys/dev/fdt/imxuart.c +++ b/sys/dev/fdt/imxuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxuart.c,v 1.6 2019/06/14 18:12:55 cheloha Exp $ */ +/* $OpenBSD: imxuart.c,v 1.7 2019/06/15 14:15:12 kettenis Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@motorola.com> * @@ -301,7 +301,7 @@ imxuart_param(struct tty *tp, struct termios *t) while (ISSET(tp->t_state, TS_BUSY)) { ++sc->sc_halt; error = ttysleep(tp, &tp->t_outq, - TTOPRI | PCATCH, "imxuartprm"); + TTOPRI | PCATCH, "imxuartprm", 0); --sc->sc_halt; if (error) { imxuart_start(tp); @@ -598,7 +598,7 @@ imxuartopen(dev_t dev, int flag, int mode, struct proc *p) !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, - TTIPRI | PCATCH, ttopen); + TTIPRI | PCATCH, ttopen, 0); /* * If TS_WOPEN has been reset, that means the * cua device has been closed. We don't want |