diff --git a/[refs] b/[refs]
index 98a195ae7a8f..12f6673fe03b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46da27664887fb95cedba53eafcf876de812c8c1
+refs/heads/master: e59464c735db19619cde2aa331609adb02005f5b
diff --git a/trunk/lib/flex_array.c b/trunk/lib/flex_array.c
index 66eef2e4483e..41b1804fa728 100644
--- a/trunk/lib/flex_array.c
+++ b/trunk/lib/flex_array.c
@@ -99,7 +99,7 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total,
 	ret->element_size = element_size;
 	ret->total_nr_elements = total;
 	if (elements_fit_in_base(ret) && !(flags & __GFP_ZERO))
-		memset(ret->parts[0], FLEX_ARRAY_FREE,
+		memset(&ret->parts[0], FLEX_ARRAY_FREE,
 						FLEX_ARRAY_BASE_BYTES_LEFT);
 	return ret;
 }