diff --git a/[refs] b/[refs]
index 7fa1f77fe897..2443806e796b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1a28c02843efcfcc41982149880bac3ac180234
+refs/heads/master: 13ba42df4a385d7b77d7aac32b93bdcd73e6d6e1
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index 42c1ff21d352..61618080b86f 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -463,7 +463,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
 	      
 		if (!buf_size) {
 			/* XIP case. Just look, point at the summary if it's there */
-			sm = (void *)buf + jeb->offset - sizeof(*sm);
+			sm = (void *)buf + c->sector_size - sizeof(*sm);
 			if (je32_to_cpu(sm->magic) == JFFS2_SUM_MAGIC) {
 				sumptr = buf + je32_to_cpu(sm->offset);
 				sumlen = c->sector_size - je32_to_cpu(sm->offset);