diff --git a/[refs] b/[refs]
index 1e1154b2b3bf..fedbf01233b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d676c11727815761e41a81b00c054b4bec452ae5
+refs/heads/master: 57ca7deb062abf56168d15f000c16e25f88a9cf3
diff --git a/trunk/fs/jffs2/file.c b/trunk/fs/jffs2/file.c
index 5edc2bf20581..23c947539864 100644
--- a/trunk/fs/jffs2/file.c
+++ b/trunk/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)