Merge branch 'master' into devel-3.2

Conflicts:
	super-intel.c

diff --git a/super-intel.c b/super-intel.c
index 29438988a2a11b72556b80764f490f119c9689f7..38f9622591c0fd5d6a911645c7883ff93535aa5c 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -4208,7 +4208,8 @@ static void default_geometry_imsm(struct supertype *st, int *level, int *layout,
        if (level && layout && *layout == UnSet)
                *layout = imsm_level_to_layout(*level);
 
-       if (chunk && (*chunk == UnSet || *chunk == 0) && super->orom)
+       if (chunk && (*chunk == UnSet || *chunk == 0) && 
+           super && super->orom)
                *chunk = imsm_orom_default_chunk(super->orom);
 }