diff --git a/[refs] b/[refs]
index 709de0df39eb..f4ed3083c9b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e86a9b95f198d7df49b25fcd808ee39cba218f
+refs/heads/master: c41ab6a1b9028de33e74101cb0aae13098a56fdb
diff --git a/trunk/include/linux/flex_array.h b/trunk/include/linux/flex_array.h
index 631b77f2ac70..70e4efabe0fb 100644
--- a/trunk/include/linux/flex_array.h
+++ b/trunk/include/linux/flex_array.h
@@ -71,7 +71,7 @@ void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
 int flex_array_shrink(struct flex_array *fa);
 
 #define flex_array_put_ptr(fa, nr, src, gfp) \
-	flex_array_put(fa, nr, &(void *)(src), gfp)
+	flex_array_put(fa, nr, (void *)&(src), gfp)
 
 void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr);