---

yaml --- r: 95387 b: refs/heads/master c: 43af853 h: refs/heads/master i: 95385: 4af237f 95383: e2a99a3 v: v3
git-mirror · Apr 29, 2008 · ecf1f28 · ecf1f28
1 parent b967b57
commit ecf1f28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a732ed6d0e126d4c8a818f42a13f3df11755bee
+refs/heads/master: 43af8532ecd74a61f9e7aeb27c026c1ee27915ca
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -411,9 +411,12 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	br_fdb_delete_by_port(br, p, 1);
 err1:
 	kobject_del(&p->kobj);
-	return err;
+	goto put_back;
 err0:
 	kobject_put(&p->kobj);
+
+put_back:
+	dev_put(dev);
 	return err;
 }