aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-07-16 12:10:35 -0400
committerJiri Kosina <jkosina@suse.cz>2011-07-22 10:47:15 -0400
commitdf2e301fee3c2c2a87592151397ad7699bb14c37 (patch)
tree09364e1443d8cac6c415af5e8d07b2b37793b68e /fs/jffs2
parent497888cf69bf607ac1fe061a6437e0a670b0022f (diff)
fs: Merge split strings
No idea why these were split in the first place... Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/readinode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 2ab1a0d91210..ee57bac1ba6d 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -1041,7 +1041,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
1041 /* FIXME: point() */ 1041 /* FIXME: point() */
1042 err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf); 1042 err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf);
1043 if (err) { 1043 if (err) {
1044 JFFS2_ERROR("can not read %d bytes from 0x%08x, " "error code: %d.\n", len, ref_offset(ref), err); 1044 JFFS2_ERROR("can not read %d bytes from 0x%08x, error code: %d.\n", len, ref_offset(ref), err);
1045 goto free_out; 1045 goto free_out;
1046 } 1046 }
1047 1047