Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[mv-sheeva.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 142ebac141764b5deffdbde15c3c6510d6e4d770..b1b3b0fbf41c1b168c67f7ebdf93e3c8f9e32cf5 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -432,6 +432,7 @@ err2:
        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: