---

yaml --- r: 166563 b: refs/heads/master c: 30df94f h: refs/heads/master i: 166561: 0fd28e5 166559: b612343 v: v3
git-mirror · Sep 28, 2009 · 28d4fef · 28d4fef
1 parent db3b086
commit 28d4fef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8823ad31cd3baf73bd21913cf030b9e7afd22923
+refs/heads/master: 30df94f800368a016d09ee672c9fcc20751d0260
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -432,6 +432,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	br_fdb_delete_by_port(br, p, 1);
 err1:
 	kobject_put(&p->kobj);
+	p = NULL; /* kobject_put frees */
 err0:
 	dev_set_promiscuity(dev, -1);
 put_back: