From 4f70c00da94558136f9190f77563eb4aaaecc6fe Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 16 Jul 2008 16:34:54 +0200
Subject: [PATCH] --- yaml --- r: 111164 b: refs/heads/master c:
 d92a8e81e097968d8f2bac0581a0a43bff14b8f0 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/net/ieee80211/ieee80211_module.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6734ffaf3b1d..b777413adec4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ff41eb0d9a937957d481d4f058a91230851ae17
+refs/heads/master: d92a8e81e097968d8f2bac0581a0a43bff14b8f0
diff --git a/trunk/net/ieee80211/ieee80211_module.c b/trunk/net/ieee80211/ieee80211_module.c
index 3bca97f55d47..949772a5a7dc 100644
--- a/trunk/net/ieee80211/ieee80211_module.c
+++ b/trunk/net/ieee80211/ieee80211_module.c
@@ -157,7 +157,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 	err = ieee80211_networks_allocate(ieee);
 	if (err) {
 		IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
-		goto failed;
+		goto failed_free_netdev;
 	}
 	ieee80211_networks_initialize(ieee);
 
@@ -193,9 +193,9 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 
 	return dev;
 
-      failed:
-	if (dev)
-		free_netdev(dev);
+failed_free_netdev:
+	free_netdev(dev);
+failed:
 	return NULL;
 }