diff --git a/[refs] b/[refs]
index f1494879706f..e7af6075bfac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a15d0b365e9bbf04dacb44fbe69d15f6594460e1
+refs/heads/master: 3a21138d3f76296ad070a3692d72eb529e7d5d2c
diff --git a/trunk/drivers/staging/android/ram_console.c b/trunk/drivers/staging/android/ram_console.c
index 29d347e802ed..d956b8441442 100644
--- a/trunk/drivers/staging/android/ram_console.c
+++ b/trunk/drivers/staging/android/ram_console.c
@@ -150,6 +150,9 @@ static int __init ram_console_late_init(void)
 	struct proc_dir_entry *entry;
 	struct persistent_ram_zone *prz = ram_console_zone;
 
+	if (!prz)
+		return 0;
+
 	if (persistent_ram_old_size(prz) == 0)
 		return 0;