Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / batman-adv / originator.c

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index da72494..6a4d3f4 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -799,12 +799,10 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb)
  out:
        if (hardif)
                batadv_hardif_put(hardif);
-       if (hard_iface)
-               dev_put(hard_iface);
+       dev_put(hard_iface);
        if (primary_if)
                batadv_hardif_put(primary_if);
-       if (soft_iface)
-               dev_put(soft_iface);
+       dev_put(soft_iface);
 
        return ret;
 }
@@ -1412,12 +1410,10 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb)
  out:
        if (hardif)
                batadv_hardif_put(hardif);
-       if (hard_iface)
-               dev_put(hard_iface);
+       dev_put(hard_iface);
        if (primary_if)
                batadv_hardif_put(primary_if);
-       if (soft_iface)
-               dev_put(soft_iface);
+       dev_put(soft_iface);
 
        return ret;
 }