---

yaml --- r: 46621 b: refs/heads/master c: b067db4 h: refs/heads/master i: 46619: 6ea1491 v: v3
git-mirror · Feb 7, 2007 · 8498a2f · 8498a2f
1 parent 9426056
commit 8498a2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f75065367077bd3b77842a5aa523ecd05d33e82d
+refs/heads/master: b067db49e1f4013ef02ef68845701b600e88a722
diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
@@ -195,8 +195,7 @@ int kobject_add(struct kobject * kobj)
 	if (error) {
 		/* unlink does the kobject_put() for us */
 		unlink(kobj);
-		if (parent)
-			kobject_put(parent);
+		kobject_put(parent);
 
 		/* be noisy on error issues */
 		if (error == -EEXIST)
@@ -420,8 +419,7 @@ void kobject_cleanup(struct kobject * kobj)
 		t->release(kobj);
 	if (s)
 		kset_put(s);
-	if (parent) 
-		kobject_put(parent);
+	kobject_put(parent);
 }
 
 static void kobject_release(struct kref *kref)