---

yaml --- r: 201199 b: refs/heads/master c: 24b1442 h: refs/heads/master i: 201197: e32698d 201195: def5c55 201191: 48afc4c 201183: a7281b1 v: v3
git-mirror · Jul 26, 2010 · e751dca · e751dca
1 parent ae90857
commit e751dca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fe9b6fef11771461e69ecd1bc8935a1c7c90cb5
+refs/heads/master: 24b1442d01ae155ea716dfb94ed21605541c317d
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
@@ -673,7 +673,7 @@ static struct kobject *get_device_parent(struct device *dev,
 		 */
 		if (parent == NULL)
 			parent_kobj = virtual_device_parent(dev);
-		else if (parent->class)
+		else if (parent->class && !dev->class->ns_type)
 			return &parent->kobj;
 		else
 			parent_kobj = &parent->kobj;