---

yaml
---
r: 157103
b: refs/heads/master
c: a30b595
h: refs/heads/master
i:
  157101: 4bd1c13
  157099: ad7c031
  157095: b225632
  157087: 6c12a67
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 054b2b13ccba4876a1ce98a7ede7dab7d6893d01
+refs/heads/master: a30b595d2ca6d39e784a1bed5f2b35f3d7a03af7

trunk/lib/flex_array.c

@@ -198,10 +198,11 @@ int flex_array_put(struct flex_array *fa, int element_nr, void *src, gfp_t flags
 		return -ENOSPC;
 	if (elements_fit_in_base(fa))
 		part = (struct flex_array_part *)&fa->parts[0];
-	else
+	else {
 		part = __fa_get_part(fa, part_nr, flags);
-	if (!part)
-		return -ENOMEM;
+		if (!part)
+			return -ENOMEM;
+	}
 	dst = &part->elements[index_inside_part(fa, element_nr)];
 	memcpy(dst, src, fa->element_size);
 	return 0;
@@ -257,11 +258,12 @@ void *flex_array_get(struct flex_array *fa, int element_nr)
 
 	if (element_nr >= fa->total_nr_elements)
 		return NULL;
-	if (!fa->parts[part_nr])
-		return NULL;
 	if (elements_fit_in_base(fa))
 		part = (struct flex_array_part *)&fa->parts[0];
-	else
+	else {
 		part = fa->parts[part_nr];
+		if (!part)
+			return NULL;
+	}
 	return &part->elements[index_inside_part(fa, element_nr)];
 }