diff --git a/[refs] b/[refs]
index d1073bc0b26b..c940502dec58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cc93992cc4cf12ddfe63c8a5be2d509e6678e99
+refs/heads/master: 7dd58748592db1e5a77cfbddb8beffcfdb0242fe
diff --git a/trunk/drivers/net/wireless/ath9k/debug.c b/trunk/drivers/net/wireless/ath9k/debug.c
index fdf9528fa49b..97df20cbf528 100644
--- a/trunk/drivers/net/wireless/ath9k/debug.c
+++ b/trunk/drivers/net/wireless/ath9k/debug.c
@@ -498,6 +498,9 @@ int ath9k_init_debug(struct ath_softc *sc)
 {
 	sc->debug.debug_mask = ath9k_debug;
 
+	if (!ath9k_debugfs_root)
+		return -ENOENT;
+
 	sc->debug.debugfs_phy = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
 						      ath9k_debugfs_root);
 	if (!sc->debug.debugfs_phy)