diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
| commit | ab55570d64d5409fa940e85dd8de2594b160f826 (patch) | |
| tree | 4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /net/wireless/core.c | |
| parent | eef9d90dcde7bb4d029b67ed36457efc4970d5a2 (diff) | |
| parent | 8713a7ccd88d93d9f8a72436088d6627c82490db (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 24fdd4cd22c..5031db7b275 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: |