Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[cascardo/linux.git] / lib / seq_buf.c

diff --git a/lib/seq_buf.c b/lib/seq_buf.c
index 5c94e10..cb18469 100644 (file)
--- a/lib/seq_buf.c
+++ b/lib/seq_buf.c
@@ -306,10 +306,12 @@ int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, int cnt)
        if (!cnt)
                return 0;
 
-       if (s->len <= s->readpos)
+       len = seq_buf_used(s);
+
+       if (len <= s->readpos)
                return -EBUSY;
 
-       len = seq_buf_used(s) - s->readpos;
+       len -= s->readpos;
        if (cnt > len)
                cnt = len;
        ret = copy_to_user(ubuf, s->buffer + s->readpos, cnt);