---

yaml --- r: 289215 b: refs/heads/master c: 3a21138 h: refs/heads/master i: 289213: 8ef9ee6 289211: 54c5a3e 289207: 3014ba2 289199: 3e06e12 289183: fa494ac 289151: 4b7db50 v: v3
git-mirror · Mar 8, 2012 · 82849b4 · 82849b4
1 parent 57b77dd
commit 82849b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;