From fba4f3d54a2921c92f69eea73743ece69f2ae889 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Feb 2008 11:58:54 -0500
Subject: [PATCH] --- yaml --- r: 84326 b: refs/heads/master c:
 969affd276dec81a35a5ad10d4e05e62e93b380b h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/sysfs/group.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3050dc107dc0..881d4aa9afdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d640c4a5b36c4733460065db1554da924044511
+refs/heads/master: 969affd276dec81a35a5ad10d4e05e62e93b380b
diff --git a/trunk/fs/sysfs/group.c b/trunk/fs/sysfs/group.c
index 0871c3dadce1..477904915032 100644
--- a/trunk/fs/sysfs/group.c
+++ b/trunk/fs/sysfs/group.c
@@ -77,7 +77,12 @@ void sysfs_remove_group(struct kobject * kobj,
 
 	if (grp->name) {
 		sd = sysfs_get_dirent(dir_sd, grp->name);
-		BUG_ON(!sd);
+		if (!sd) {
+			printk(KERN_WARNING "sysfs group %p not found for "
+				"kobject '%s'\n", grp, kobject_name(kobj));
+			WARN_ON(!sd);
+			return;
+		}
 	} else
 		sd = sysfs_get(dir_sd);