From bfe9653ab5a1637677b73bb7150add7bd37f6e8b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 8 Oct 2008 10:18:36 +0200
Subject: [PATCH] --- yaml --- r: 115024 b: refs/heads/master c:
 c74e90a9e37c4a3923905189a6ebbd7ef61e6e67 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b166dcce4e1..12b00991b65b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5d7c584810b3be2b70c979af3283a1e48b6574d
+refs/heads/master: c74e90a9e37c4a3923905189a6ebbd7ef61e6e67
diff --git a/trunk/net/mac80211/debugfs_netdev.c b/trunk/net/mac80211/debugfs_netdev.c
index 2a4515623776..2ad504fc3414 100644
--- a/trunk/net/mac80211/debugfs_netdev.c
+++ b/trunk/net/mac80211/debugfs_netdev.c
@@ -545,8 +545,12 @@ static int netdev_notify(struct notifier_block *nb,
 
 	sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-	sprintf(buf, "netdev:%s", dev->name);
 	dir = sdata->debugfsdir;
+
+	if (!dir)
+		return 0;
+
+	sprintf(buf, "netdev:%s", dev->name);
 	if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
 		printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs "
 		       "dir to %s\n", buf);