From d16da1a435d45b23fe385f2b6d0d3693f43d6c83 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Wed, 24 Nov 2010 12:53:16 +0200
Subject: [PATCH] --- yaml --- r: 225314 b: refs/heads/master c:
 d60080ae06b98790036104f07fa897cfc151ce12 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/wl12xx/debugfs.c | 3 ++-
 trunk/drivers/net/wireless/wl12xx/main.c    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 324bf6007926..f82b550338b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cb2cea9f0f207f819db9823413fa263175b6230
+refs/heads/master: d60080ae06b98790036104f07fa897cfc151ce12
diff --git a/trunk/drivers/net/wireless/wl12xx/debugfs.c b/trunk/drivers/net/wireless/wl12xx/debugfs.c
index 402df14e091b..2ac289e51484 100644
--- a/trunk/drivers/net/wireless/wl12xx/debugfs.c
+++ b/trunk/drivers/net/wireless/wl12xx/debugfs.c
@@ -423,7 +423,8 @@ int wl1271_debugfs_init(struct wl1271 *wl)
 {
 	int ret;
 
-	wl->rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+	wl->rootdir = debugfs_create_dir(KBUILD_MODNAME,
+					 wl->hw->wiphy->debugfsdir);
 
 	if (IS_ERR(wl->rootdir)) {
 		ret = PTR_ERR(wl->rootdir);
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index b2432dab4b51..7fecefe8d3c1 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl)
 
 	wl->mac80211_registered = true;
 
+	wl1271_debugfs_init(wl);
+
 	register_netdevice_notifier(&wl1271_dev_notifier);
 
 	wl1271_notice("loaded");
@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
 	/* Apply default driver configuration. */
 	wl1271_conf_init(wl);
 
-	wl1271_debugfs_init(wl);
-
 	order = get_order(WL1271_AGGR_BUFFER_SIZE);
 	wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
 	if (!wl->aggr_buf) {