diff --git a/MAINTAINERS b/MAINTAINERS
index 5b454627f211b56aff1d7428eacae08173df9db7..231bda28c428dd11a26168a5f205d81c59fcc791 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2129,8 +2129,8 @@ S:	Maintained
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 P:	David Woodhouse
 M:	dwmw2@infradead.org
-L:	jffs-dev@axis.com
-W:	http://sources.redhat.com/jffs2/
+L:	linux-mtd@lists.infradead.org
+W:	http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:	Maintained
 
 JFS FILESYSTEM
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 9728614b89588252431f83ffa454cd1bd89c020d..77fc5838609ce3d3a3246abdeb8910ab593f782a 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -372,7 +372,7 @@ int jffs2_init_acl_post(struct inode *inode)
 			return rc;
 	}
 
-	return rc;
+	return 0;
 }
 
 void jffs2_clear_acl(struct jffs2_inode_info *f)