From 82849b492f9c056e41e74ae5dbdd9517de3e6f4d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 7 Mar 2012 17:34:37 -0800
Subject: [PATCH] --- yaml --- r: 289215 b: refs/heads/master c:
 3a21138d3f76296ad070a3692d72eb529e7d5d2c h: refs/heads/master i:   289213:
 8ef9ee607a00b937669acf73412b1ec6bbed17e6   289211:
 54c5a3e84c7b57deffeea1721ca754b208fad0c8   289207:
 3014ba29595f1958a0896f335bf8e3cda97f246b   289199:
 3e06e12870aa66961b7f5618c4295707ff66cc00   289183:
 fa494ac8989dfcab474a08ec7f82de4982240483   289151:
 4b7db502ec609400c1fabf7b1dd9780faf5a3a85 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/android/ram_console.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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;