diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 320dd48b834ee48beaa821daede6fd1d2c9f99ae..9c2077e7e081c7375b3df564fa1b8e3b6e2d4722 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -267,6 +267,8 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
 	}
 
 	rc = do_jffs2_setxattr(inode, xprefix, "", value, size, 0);
+	if (!value && rc == -ENODATA)
+		rc = 0;
 	if (value)
 		kfree(value);
 	if (!rc) {