From d9cd65cfbd8b71775be30196f6a5de3af2bda364 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 30 Aug 2011 03:51:09 +0000
Subject: [PATCH] --- yaml --- r: 265724 b: refs/heads/master c:
 dc00fd44413e9d4310d0dc6bcc3bd8e57ba8f064 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/ieee802154/6lowpan.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fa47d8a7acfd..3c8bc5b82d48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aec9db355ce2b930358ade5a71cc00ac258e1b3f
+refs/heads/master: dc00fd44413e9d4310d0dc6bcc3bd8e57ba8f064
diff --git a/trunk/net/ieee802154/6lowpan.c b/trunk/net/ieee802154/6lowpan.c
index 5dc04890e0c5..f0d15365722a 100644
--- a/trunk/net/ieee802154/6lowpan.c
+++ b/trunk/net/ieee802154/6lowpan.c
@@ -793,8 +793,11 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
 	mutex_init(&lowpan_dev_info(dev)->dev_list_mtx);
 
 	entry = kzalloc(sizeof(struct lowpan_dev_record), GFP_KERNEL);
-	if (!entry)
+	if (!entry) {
+		dev_put(real_dev);
+		lowpan_dev_info(dev)->real_dev = NULL;
 		return -ENOMEM;
+	}
 
 	entry->ldev = dev;