Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / lib / flex_array.c

diff --git a/lib/flex_array.c b/lib/flex_array.c
index 66eef2e..41b1804 100644 (file)
--- a/lib/flex_array.c
+++ b/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;
 }