diff --git a/[refs] b/[refs] index 4fcb6a259e79..7037dbf402dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a64685399181780998281fe07309a94b25dd24c3 +refs/heads/master: 58ebb34c49fcfcaa029e4b1c1453d92583900f9a diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c index 15c8d3505450..d9babda582b9 100644 --- a/trunk/drivers/md/raid0.c +++ b/trunk/drivers/md/raid0.c @@ -289,7 +289,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf) kfree(conf->strip_zone); kfree(conf->devlist); kfree(conf); - *private_conf = NULL; + *private_conf = ERR_PTR(err); return err; }