diff --git a/[refs] b/[refs]
index 936c4427cb17..8a1905c02ef7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42df2c99162d1da63f11d073059e9633bfec11d0
+refs/heads/master: 869a2a09e40529f2f3614893c98b27a87a33eaa6
diff --git a/trunk/arch/arm/mach-msm/smd_debug.c b/trunk/arch/arm/mach-msm/smd_debug.c
index 0cc3ef8a94d3..3b2dd717b788 100644
--- a/trunk/arch/arm/mach-msm/smd_debug.c
+++ b/trunk/arch/arm/mach-msm/smd_debug.c
@@ -221,13 +221,13 @@ static void debug_create(const char *name, mode_t mode,
 	debugfs_create_file(name, mode, dent, fill, &debug_ops);
 }
 
-static void smd_debugfs_init(void)
+static int smd_debugfs_init(void)
 {
 	struct dentry *dent;
 
 	dent = debugfs_create_dir("smd", 0);
 	if (IS_ERR(dent))
-		return;
+		return 1;
 
 	debug_create("ch", 0444, dent, debug_read_ch);
 	debug_create("stat", 0444, dent, debug_read_stat);
@@ -235,6 +235,8 @@ static void smd_debugfs_init(void)
 	debug_create("version", 0444, dent, debug_read_version);
 	debug_create("tbl", 0444, dent, debug_read_alloc_tbl);
 	debug_create("build", 0444, dent, debug_read_build_id);
+
+	return 0;
 }
 
 late_initcall(smd_debugfs_init);