diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 22:41:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-27 15:01:44 -0800 |
| commit | c12da96f801a3f45b0634c966b9e7cda307daa72 (patch) | |
| tree | 470bde777d834f7a3572d8737d6af12b0881ada1 /drivers/tty/tty_io.c | |
| parent | 6ffeb4b2782b31f3d7158795a451ad371955e8a2 (diff) | |
| download | op-kernel-dev-c12da96f801a3f45b0634c966b9e7cda307daa72.zip op-kernel-dev-c12da96f801a3f45b0634c966b9e7cda307daa72.tar.gz | |
tty: Use 'disc' for line discipline index name
tty->ldisc is a ptr to struct tty_ldisc, but unfortunately 'ldisc' is
also used as a parameter or local name to refer to the line discipline
index value (ie, N_TTY, N_GSM, etc.); instead prefer the name used
by the line discipline registration/ref counting functions.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index eb26754..7f556e3 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2662,13 +2662,13 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t _ static int tiocsetd(struct tty_struct *tty, int __user *p) { - int ldisc; + int disc; int ret; - if (get_user(ldisc, p)) + if (get_user(disc, p)) return -EFAULT; - ret = tty_set_ldisc(tty, ldisc); + ret = tty_set_ldisc(tty, disc); return ret; } |
