---

yaml --- r: 155886 b: refs/heads/master c: c587aea h: refs/heads/master v: v3
git-mirror · Jul 27, 2009 · f71a1e3 · f71a1e3
1 parent db516e5
commit f71a1e3
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: 4a29f396429132dc59f1856ea6cfc860a1955fa1
+refs/heads/master: c587aea951a56d29741a3cef4ea3e142c93b3207
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -424,7 +424,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 err2:
 	br_fdb_delete_by_port(br, p, 1);
 err1:
-	kobject_del(&p->kobj);
+	kobject_put(&p->kobj);
 err0:
 	dev_set_promiscuity(dev, -1);
 put_back: