Merge tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6

[platform/kernel/linux-rpi.git] / drivers / tty / n_r3964.c

diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 749a608..f75696f 100644 (file)
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -1085,7 +1085,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
                pMsg = remove_msg(pInfo, pClient);
                if (pMsg == NULL) {
                        /* no messages available. */
-                       if (file->f_flags & O_NONBLOCK) {
+                       if (tty_io_nonblock(tty, file)) {
                                ret = -EAGAIN;
                                goto unlock;
                        }