Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / fs / debugfs / file.c

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index e813acf..ba7c01c 100644 (file)
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -893,7 +893,7 @@ ssize_t debugfs_read_file_str(struct file *file, char __user *user_buf,
 
        copy[copy_len] = '\n';
 
-       ret = simple_read_from_buffer(user_buf, count, ppos, copy, copy_len);
+       ret = simple_read_from_buffer(user_buf, count, ppos, copy, len);
        kfree(copy);
 
        return ret;