diff --git a/[refs] b/[refs] index c4be3fb7dd47..d0847694aa81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ec192559033ed457f0d7856838654c100fc659f +refs/heads/master: 7e5ab54296a41f590c9cbc976e1c86272f3a7e00 diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index 53be9fc82aaa..f93ff8ef47d0 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -115,7 +115,7 @@ int phonet_address_del(struct net_device *dev, u8 addr) pnd = __phonet_get(dev); if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) err = -EADDRNOTAVAIL; - if (bitmap_empty(pnd->addrs, 64)) + else if (bitmap_empty(pnd->addrs, 64)) __phonet_device_free(pnd); spin_unlock_bh(&pndevs.lock); return err;