diff --git a/[refs] b/[refs] index 4600dcb44f74..0f5ce5b1e897 100644 --- 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 index 142ebac14176..b1b3b0fbf41c 100644 --- 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: