1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 0fc33eb88855..9f69dc526f8c 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2688,8 +2688,8 @@ static void raid10d(struct md_thread *thread)
                 }
                 spin_unlock_irqrestore(&conf->device_lock, flags);
                 while (!list_empty(&tmp)) {
-                        r10_bio = list_first_entry(&conf->bio_end_io_list,
-                                                  struct r10bio, retry_list);
+                        r10_bio = list_first_entry(&tmp, struct r10bio,
+                                                   retry_list);
                         list_del(&r10_bio->retry_list);
                         raid_end_bio_io(r10_bio);
                 }
@@ -3486,8 +3486,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)
                 printk(KERN_ERR "md/raid10:%s: couldn't allocate memory.\n",
                        mdname(mddev));
         if (conf) {
-                if (conf->r10bio_pool)
-                        mempool_destroy(conf->r10bio_pool);
+                mempool_destroy(conf->r10bio_pool);
                 kfree(conf->mirrors);
                 safe_put_page(conf->tmppage);
                 kfree(conf);
@@ -3682,8 +3681,7 @@ static int run(struct mddev *mddev)
 
 out_free_conf:
         md_unregister_thread(&mddev->thread);
-        if (conf->r10bio_pool)
-                mempool_destroy(conf->r10bio_pool);
+        mempool_destroy(conf->r10bio_pool);
         safe_put_page(conf->tmppage);
         kfree(conf->mirrors);
         kfree(conf);
@@ -3696,8 +3694,7 @@ static void raid10_free(struct mddev *mddev, void *priv)
 {
         struct r10conf *conf = priv;
 
-        if (conf->r10bio_pool)
-                mempool_destroy(conf->r10bio_pool);
+        mempool_destroy(conf->r10bio_pool);
         safe_put_page(conf->tmppage);
         kfree(conf->mirrors);
         kfree(conf->mirrors_old);