diff options
| author | phk <phk@FreeBSD.org> | 2004-06-04 08:02:37 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-06-04 08:02:37 +0000 |
| commit | 9bb2c2f2d29e403661d3a82df654de61b0356def (patch) | |
| tree | 96f709f4adacd5078943626c84918a97005223bc /sys/dev/si | |
| parent | 41a29cfd2f86e0a0e54ffc45a69c5bfd031f1e2d (diff) | |
| download | FreeBSD-src-9bb2c2f2d29e403661d3a82df654de61b0356def.zip FreeBSD-src-9bb2c2f2d29e403661d3a82df654de61b0356def.tar.gz | |
Make the remaining serial drivers call ttyioctl() rather than calling
the linedisc directly.
Diffstat (limited to 'sys/dev/si')
| -rw-r--r-- | sys/dev/si/si.c | 12 |
1 files changed, 3 insertions, 9 deletions
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: |
