1 files changed, 4 insertions, 1 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 24fdd4cd22cb..5031db7b275b 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -184,7 +184,8 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
         if (result)
                 goto out_unlock;
 
-        if (!debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
+        if (rdev->wiphy.debugfsdir &&
+            !debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
                             rdev->wiphy.debugfsdir,
                             rdev->wiphy.debugfsdir->d_parent,
                             newname))
@@ -317,6 +318,8 @@ int wiphy_register(struct wiphy *wiphy)
         drv->wiphy.debugfsdir =
                 debugfs_create_dir(wiphy_name(&drv->wiphy),
                                    ieee80211_debugfs_dir);
+        if (IS_ERR(drv->wiphy.debugfsdir))
+                drv->wiphy.debugfsdir = NULL;
 
         res = 0;
 out_unlock: