diff --git a/[refs] b/[refs]
index 13a2addaf8b9..7b0dab64c5a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42fa1b92ab3261ef60ef4f60ff6eff2a0585348d
+refs/heads/master: 8bfe3638747b2c2f842edf9eb2a407a22a9d537d
diff --git a/trunk/drivers/staging/batman-adv/bat_debugfs.c b/trunk/drivers/staging/batman-adv/bat_debugfs.c
index a8fe1c91fa4c..fafca9f0a33c 100644
--- a/trunk/drivers/staging/batman-adv/bat_debugfs.c
+++ b/trunk/drivers/staging/batman-adv/bat_debugfs.c
@@ -88,6 +88,8 @@ static struct bat_debuginfo *mesh_debuginfos[] = {
 void debugfs_init(void)
 {
 	bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
+	if (bat_debugfs == ERR_PTR(-ENODEV))
+		bat_debugfs = NULL;
 }
 
 void debugfs_destroy(void)