diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
| commit | c4a4ddaefbef3c5135c3167bd5e067859d71e84c (patch) | |
| tree | 1c44a7de360774a272495593d2bb67853380da82 /net/bridge/br_mdb.c | |
| parent | 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 (diff) | |
| parent | 8723b795aaa0c5f0b9db2099af575f5e089a63f1 (diff) | |
| download | linux-c4a4ddaefbef3c5135c3167bd5e067859d71e84c.tar.gz | |
Merge tag 'asoc-fix-v3.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few of the Coverity fixes from Takashi, one of which (the wm_hubs one)
is particularly noticable.
Diffstat (limited to 'net/bridge/br_mdb.c')
| -rw-r--r-- | net/bridge/br_mdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 85a09bb5ca51..b7b1914dfa25 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -453,7 +453,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) call_rcu_bh(&p->rcu, br_multicast_free_pg); err = 0; - if (!mp->ports && !mp->mglist && mp->timer_armed && + if (!mp->ports && !mp->mglist && netif_running(br->dev)) mod_timer(&mp->timer, jiffies); break; |