From 19115e54eef314f32b87e68a73bb44d469c2af9c Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Date: Fri, 6 Mar 2009 02:51:14 +0000
Subject: [PATCH] --- yaml --- r: 132163 b: refs/heads/master c:
 ba087e6f69381de6c91d6634aa0f603a2fdc96a9 h: refs/heads/master i:   132161:
 e0aa05ad48e3a7edbe744593463a4ab268ea68f0   132159:
 09f476f3fe97236259c49861ce48c60808ad9b60 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/sh/boards/board-ap325rxa.c |  1 +
 trunk/drivers/md/md.c                 | 30 +++++++++++----------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 25f07269b9e7..701c74f6292c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bad948ffee7cbf73a7dd3e4b8272985d5c3c8b55
+refs/heads/master: ba087e6f69381de6c91d6634aa0f603a2fdc96a9
diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c
index 72da416f6162..15b6d450fbf0 100644
--- a/trunk/arch/sh/boards/board-ap325rxa.c
+++ b/trunk/arch/sh/boards/board-ap325rxa.c
@@ -22,6 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
+#include <media/soc_camera.h>
 #include <media/soc_camera_platform.h>
 #include <media/sh_mobile_ceu.h>
 #include <video/sh_mobile_lcdc.h>
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index a307f87eb90e..03b4cd0a6344 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -214,7 +214,12 @@ static inline mddev_t *mddev_get(mddev_t *mddev)
 	return mddev;
 }
 
-static void mddev_delayed_delete(struct work_struct *ws);
+static void mddev_delayed_delete(struct work_struct *ws)
+{
+	mddev_t *mddev = container_of(ws, mddev_t, del_work);
+	kobject_del(&mddev->kobj);
+	kobject_put(&mddev->kobj);
+}
 
 static void mddev_put(mddev_t *mddev)
 {
@@ -3537,21 +3542,6 @@ static struct kobj_type md_ktype = {
 
 int mdp_major = 0;
 
-static void mddev_delayed_delete(struct work_struct *ws)
-{
-	mddev_t *mddev = container_of(ws, mddev_t, del_work);
-
-	if (mddev->private == &md_redundancy_group) {
-		sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
-		if (mddev->sysfs_action)
-			sysfs_put(mddev->sysfs_action);
-		mddev->sysfs_action = NULL;
-		mddev->private = NULL;
-	}
-	kobject_del(&mddev->kobj);
-	kobject_put(&mddev->kobj);
-}
-
 static int md_alloc(dev_t dev, char *name)
 {
 	static DEFINE_MUTEX(disks_mutex);
@@ -4043,9 +4033,13 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
 			mddev->queue->merge_bvec_fn = NULL;
 			mddev->queue->unplug_fn = NULL;
 			mddev->queue->backing_dev_info.congested_fn = NULL;
+			if (mddev->pers->sync_request) {
+				sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
+				if (mddev->sysfs_action)
+					sysfs_put(mddev->sysfs_action);
+				mddev->sysfs_action = NULL;
+			}
 			module_put(mddev->pers->owner);
-			if (mddev->pers->sync_request)
-				mddev->private = &md_redundancy_group;
 			mddev->pers = NULL;
 			/* tell userspace to handle 'inactive' */
 			sysfs_notify_dirent(mddev->sysfs_state);