From 9bb2c2f2d29e403661d3a82df654de61b0356def Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 4 Jun 2004 08:02:37 +0000 Subject: Make the remaining serial drivers call ttyioctl() rather than calling the linedisc directly. --- sys/dev/si/si.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'sys/dev/si') diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index bb1c102..b4f8f07 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -1016,19 +1016,13 @@ siioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) si_write_enable(pp, 0); } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) + error = ttyioctl(dev, cmd, data, flag, td); + si_disc_optim(tp, &tp->t_termios, pp); + if (error != ENOTTY) goto out; oldspl = spltty(); - error = ttioctl(tp, cmd, data, flag); - si_disc_optim(tp, &tp->t_termios, pp); - if (error != ENOIOCTL) { - splx(oldspl); - goto out; - } - error = 0; switch (cmd) { case TIOCSBRK: -- cgit v1.1