From 1eb13f9d50bc0d8e66208c8452340c28d9b0e757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Wed, 26 Nov 2008 15:26:43 -0800
Subject: [PATCH] --- yaml --- r: 119625 b: refs/heads/master c:
 7e5ab54296a41f590c9cbc976e1c86272f3a7e00 h: refs/heads/master i:   119623:
 f7b325fad1a129dcd4b509ec4fabc923a727750b v: v3

---
 [refs]                    | 2 +-
 trunk/net/phonet/pn_dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;