diff --git a/[refs] b/[refs]
index b6a9ae04a563..fa387ae5c592 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6fb0934f923f889055152cb0b033674f627460b
+refs/heads/master: 9ba00538ada7ecb4fb8bd71ba734a8eada987817
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 90fe70d76a31..87145faac491 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1156,6 +1156,9 @@ static void bitmap_writeback_daemon(mddev_t *mddev)
 		err = -EINTR;
 		goto out;
 	}
+	if (bitmap == NULL)
+		/* about to be stopped. */
+		return;
 
 	PRINTK("%s: bitmap writeback daemon woke up...\n", bmname(bitmap));
 	/* wait on bitmap page writebacks */