diff --git a/[refs] b/[refs]
index 4d8c230a5118..017fef25331d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdae6373910c10e27b8ae07e11e821b183d0bba5
+refs/heads/master: 5809fde040de2afa477a6c593ce2e8fd2c11d9d3
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
index 7b24cf3237d8..f6081cb3fca3 100644
--- a/trunk/tools/perf/util/header.c
+++ b/trunk/tools/perf/util/header.c
@@ -955,6 +955,7 @@ static int write_topo_node(int fd, int node)
 	}
 
 	fclose(fp);
+	fp = NULL;
 
 	ret = do_write(fd, &mem_total, sizeof(u64));
 	if (ret)
@@ -981,7 +982,8 @@ static int write_topo_node(int fd, int node)
 	ret = do_write_string(fd, buf);
 done:
 	free(buf);
-	fclose(fp);
+	if (fp)
+		fclose(fp);
 	return ret;
 }