summaryrefslogtreecommitdiffstats
path: root/sys/dev/digi/digi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/digi/digi.c')
-rw-r--r--sys/dev/digi/digi.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index d5e4139..06d8d18 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -1275,22 +1275,13 @@ digiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
if (lt->c_ospeed != 0)
dt->c_ospeed = tp->t_ospeed;
}
- error = linesw[tp->t_line].l_ioctl(tp, cmd, data, flag, td);
+ error = ttyioctl(dev, cmd, data, flag, td);
if (error == 0 && cmd == TIOCGETA)
((struct termios *)data)->c_iflag |= port->c_iflag;
-
- if (error >= 0 && error != ENOIOCTL)
- return (error);
- s = spltty();
- error = ttioctl(tp, cmd, data, flag);
- if (error == 0 && cmd == TIOCGETA)
- ((struct termios *)data)->c_iflag |= port->c_iflag;
-
digi_disc_optim(tp, &tp->t_termios, port);
- if (error >= 0 && error != ENOIOCTL) {
- splx(s);
+ if (error >= 0 && error != ENOTTY)
return (error);
- }
+ s = spltty();
sc->setwin(sc, 0);
switch (cmd) {
case DIGIIO_RING:
OpenPOWER on IntegriCloud