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/sx | |
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/sx')
-rw-r--r-- | sys/dev/sx/sx.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c index 0f07f94..b3e1cf2 100644 --- a/sys/dev/sx/sx.c +++ b/sys/dev/sx/sx.c @@ -804,18 +804,13 @@ sxioctl( sx_write_enable(pp, 0); } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); - if (error != ENOIOCTL) + error = ttyioctl(dev, cmd, data, flag, p); + sx_disc_optim(tp, &tp->t_termios, pp); + if (error != ENOTTY) goto out; oldspl = spltty(); - error = ttioctl(tp, cmd, data, flag); - sx_disc_optim(tp, &tp->t_termios, pp); - if (error != ENOIOCTL) { - splx(oldspl); - goto out; - } sc = PP2SC(pp); /* Need this to do I/O to the card. */ error = 0; switch (cmd) { |