diff options
| -rw-r--r-- | drivers/md/md.c | 3 | ||||
| -rw-r--r-- | drivers/md/raid0.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index cadf9cc02b25..717daad71fb1 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -5080,7 +5080,8 @@ int md_run(struct mddev *mddev) | |||
| 5080 | } | 5080 | } |
| 5081 | if (err) { | 5081 | if (err) { |
| 5082 | mddev_detach(mddev); | 5082 | mddev_detach(mddev); |
| 5083 | pers->free(mddev, mddev->private); | 5083 | if (mddev->private) |
| 5084 | pers->free(mddev, mddev->private); | ||
| 5084 | module_put(pers->owner); | 5085 | module_put(pers->owner); |
| 5085 | bitmap_destroy(mddev); | 5086 | bitmap_destroy(mddev); |
| 5086 | return err; | 5087 | return err; |
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index a13f738a7b39..3ed9f42ddca6 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c | |||
| @@ -467,8 +467,6 @@ static int raid0_run(struct mddev *mddev) | |||
| 467 | dump_zones(mddev); | 467 | dump_zones(mddev); |
| 468 | 468 | ||
| 469 | ret = md_integrity_register(mddev); | 469 | ret = md_integrity_register(mddev); |
| 470 | if (ret) | ||
| 471 | raid0_free(mddev, conf); | ||
| 472 | 470 | ||
| 473 | return ret; | 471 | return ret; |
| 474 | } | 472 | } |
