summaryrefslogtreecommitdiff
path: root/sys/dev/si
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2004-06-04 08:02:37 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2004-06-04 08:02:37 +0000
commite451f9b758040542701d72994b457233fe2529a7 (patch)
tree96f709f4adacd5078943626c84918a97005223bc /sys/dev/si
parentd1afdc6644ad956e9bbfd4e679bf09dc5461bbcd (diff)
Notes
Diffstat (limited to 'sys/dev/si')
-rw-r--r--sys/dev/si/si.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index bb1c102675e6..b4f8f0703ca6 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: