Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 5970196..c8f56c9 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -2130,7 +2130,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
        ssize_t retval = 0;
        long timeout;
        bool packet;
-       size_t tail;
+       size_t old_tail;
 
        /*
         * Is this a continuation of a read started earler?
@@ -2193,7 +2193,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
        }
 
        packet = tty->ctrl.packet;
-       tail = ldata->read_tail;
+       old_tail = ldata->read_tail;
 
        add_wait_queue(&tty->read_wait, &wait);
        while (nr) {
@@ -2282,7 +2282,7 @@ more_to_be_read:
                if (time)
                        timeout = time;
        }
-       if (tail != ldata->read_tail)
+       if (old_tail != ldata->read_tail)
                n_tty_kick_worker(tty);
        up_read(&tty->termios_rwsem);