diff --git a/[refs] b/[refs]
index 16b63a830764..b8020191af6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5407a56257b6ade44fd9bcac972c99845b7413cd
+refs/heads/master: 315c1998e10527ff364a9883048455e609bc7232
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 93b0239bc34d..8c200e86da4c 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3563,7 +3563,7 @@ static int mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
 	int type = MEMFILE_TYPE(cft->private);
 	u64 usage;
 	int size = 0;
-	int i, j, ret;
+	int i, j, ret = 0;
 
 	mutex_lock(&memcg->thresholds_lock);
 	if (type == _MEM)