Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 03f0cd872dce..3c03f6512c5f 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -68,7 +68,6 @@ static void __lapb_remove_cb(struct lapb_cb *lapb)
                 lapb_put(lapb);
         }
 }
-EXPORT_SYMBOL(lapb_register);
 
 /*
  *      Add a socket to the bound sockets list.
@@ -115,7 +114,6 @@ static struct lapb_cb *lapb_create_cb(void)
 {
         struct lapb_cb *lapb = kzalloc(sizeof(*lapb), GFP_ATOMIC);
 
-
         if (!lapb)
                 goto out;
 
@@ -167,6 +165,7 @@ out:
         write_unlock_bh(&lapb_list_lock);
         return rc;
 }
+EXPORT_SYMBOL(lapb_register);
 
 int lapb_unregister(struct net_device *dev)
 {
@@ -177,6 +176,7 @@ int lapb_unregister(struct net_device *dev)
         lapb = __lapb_devtostruct(dev);
         if (!lapb)
                 goto out;
+        lapb_put(lapb);
 
         lapb_stop_t1timer(lapb);
         lapb_stop_t2timer(lapb);