From ecf1f287f7ad982b5746c442662a64717018f4a7 Mon Sep 17 00:00:00 2001 From: Volodymyr G Lukiianyk Date: Tue, 29 Apr 2008 03:17:42 -0700 Subject: [PATCH] --- yaml --- r: 95387 b: refs/heads/master c: 43af8532ecd74a61f9e7aeb27c026c1ee27915ca h: refs/heads/master i: 95385: 4af237f2f1ee3431fd2ebb9ab063d2d0cb68a22b 95383: e2a99a3646e89fda523bcd9eadb9ea2bc24bc533 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_if.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72bfddaad9e9..0374acab9a25 100644 --- 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 index 298e0f463c56..77a981a1ee52 100644 --- 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; }