diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/debugfs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c index 402df14e091b..2ac289e51484 100644 --- a/drivers/net/wireless/wl12xx/debugfs.c +++ b/drivers/net/wireless/wl12xx/debugfs.c | |||
@@ -423,7 +423,8 @@ int wl1271_debugfs_init(struct wl1271 *wl) | |||
423 | { | 423 | { |
424 | int ret; | 424 | int ret; |
425 | 425 | ||
426 | wl->rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL); | 426 | wl->rootdir = debugfs_create_dir(KBUILD_MODNAME, |
427 | wl->hw->wiphy->debugfsdir); | ||
427 | 428 | ||
428 | if (IS_ERR(wl->rootdir)) { | 429 | if (IS_ERR(wl->rootdir)) { |
429 | ret = PTR_ERR(wl->rootdir); | 430 | ret = PTR_ERR(wl->rootdir); |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index b2432dab4b51..7fecefe8d3c1 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl) | |||
2602 | 2602 | ||
2603 | wl->mac80211_registered = true; | 2603 | wl->mac80211_registered = true; |
2604 | 2604 | ||
2605 | wl1271_debugfs_init(wl); | ||
2606 | |||
2605 | register_netdevice_notifier(&wl1271_dev_notifier); | 2607 | register_netdevice_notifier(&wl1271_dev_notifier); |
2606 | 2608 | ||
2607 | wl1271_notice("loaded"); | 2609 | wl1271_notice("loaded"); |
@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) | |||
2736 | /* Apply default driver configuration. */ | 2738 | /* Apply default driver configuration. */ |
2737 | wl1271_conf_init(wl); | 2739 | wl1271_conf_init(wl); |
2738 | 2740 | ||
2739 | wl1271_debugfs_init(wl); | ||
2740 | |||
2741 | order = get_order(WL1271_AGGR_BUFFER_SIZE); | 2741 | order = get_order(WL1271_AGGR_BUFFER_SIZE); |
2742 | wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order); | 2742 | wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order); |
2743 | if (!wl->aggr_buf) { | 2743 | if (!wl->aggr_buf) { |