Various typo fixes.

[linux-2.6-omap-h63xx.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f35c1a378d0fb6742273bf7d6b745b6f125224c2..aff6a779c9c82e1df96417f55d086656fc6274cc 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -108,6 +108,7 @@ static void port_carrier_check(struct work_struct *work)
                spin_unlock_bh(&br->lock);
        }
 done:
+       dev_put(dev);
        rtnl_unlock();
 }
 
@@ -161,7 +162,8 @@ static void del_nbp(struct net_bridge_port *p)
 
        dev_set_promiscuity(dev, -1);
 
-       cancel_delayed_work(&p->carrier_check);
+       if (cancel_delayed_work(&p->carrier_check))
+               dev_put(dev);
 
        spin_lock_bh(&br->lock);
        br_stp_disable_port(p);
@@ -444,7 +446,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        spin_lock_bh(&br->lock);
        br_stp_recalculate_bridge_id(br);
        br_features_recompute(br);
-       schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+       if (schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE))
+               dev_hold(dev);
+
        spin_unlock_bh(&br->lock);
 
        dev_set_mtu(br->dev, br_min_mtu(br));