diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 04:22:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 04:22:01 -0400 |
| commit | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (patch) | |
| tree | 1d38f828b212adc0a0f2d100d58544979fab543d /net/bridge | |
| parent | bb3daa4a5960cd9d39bad88679fcf587b456c05d (diff) | |
| parent | cda6d377ec6b2ee2e58d563d0bd7eb313e0165df (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 727c5c510a60..8a96672e2c5c 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
| @@ -426,7 +426,6 @@ err2: | |||
| 426 | err1: | 426 | err1: |
| 427 | kobject_del(&p->kobj); | 427 | kobject_del(&p->kobj); |
| 428 | err0: | 428 | err0: |
| 429 | kobject_put(&p->kobj); | ||
| 430 | dev_set_promiscuity(dev, -1); | 429 | dev_set_promiscuity(dev, -1); |
| 431 | put_back: | 430 | put_back: |
| 432 | dev_put(dev); | 431 | dev_put(dev); |