From 2d3cb18b8a9edc7c20488464b9a3413d62ebf4de Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 31 Mar 2009 14:39:39 +1100
Subject: [PATCH] --- yaml --- r: 139923 b: refs/heads/master c:
 e0cf8f045b2023b0b3f919ee93eb94345f648434 h: refs/heads/master i:   139921:
 790b049c6da9a8c66b89752c142659f919e1804e   139919:
 2883b2c9c6a363ad19f680ebec8acf9bdb744ac2 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/md.c    | 2 ++
 trunk/drivers/md/raid5.c | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 46395d9ba7e4..39df7ab3e72b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91adb56473febeeb3ef657bb5147ddd355465700
+refs/heads/master: e0cf8f045b2023b0b3f919ee93eb94345f648434
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 117ea5fde568..f30f09cb08e8 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -5382,6 +5382,8 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev,
 
 void md_unregister_thread(mdk_thread_t *thread)
 {
+	if (!thread)
+		return;
 	dprintk("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));
 
 	kthread_stop(thread->tsk);
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index d019a85547b4..81789fa7a023 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -4463,8 +4463,7 @@ static int run(mddev_t *mddev)
 
 	return 0;
 abort:
-	if (mddev->thread)
-		md_unregister_thread(mddev->thread);
+	md_unregister_thread(mddev->thread);
 	mddev->thread = NULL;
 	if (conf) {
 		shrink_stripes(conf);