Merge branch 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generi...

[~andy/linux] / fs / jffs2 / file.c

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 5edc2bf2058134505369a0f7844363f7e3a2ecfd..23c947539864a0c0613ade018cb9e6400149de3a 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -99,7 +99,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
        kunmap(pg);
 
        D2(printk(KERN_DEBUG "readpage finished\n"));
-       return 0;
+       return ret;
 }
 
 int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg)