From 32f158670b33ed60b5c2d97887cf5821a70034b4 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 14 Oct 2009 22:54:40 +0000
Subject: [PATCH] --- yaml --- r: 175719 b: refs/heads/master c:
 fd62c6c448669a946e94fbb0ad179918b2233e3d h: refs/heads/master i:   175717:
 5f209efe91e03f0fbaacc3d9966e56b774c9b46e   175715:
 6ffc2fa54082d2676a596f929f14eb1e9c770ce4   175711:
 e0ba118b87a883485a93d5b4bff4781a381feb36 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/nvram_64.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45070e849f28..4a3732b14afa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae7dd0208f62f1d6db4c49b85e54fa7bbed0ea4e
+refs/heads/master: fd62c6c448669a946e94fbb0ad179918b2233e3d
diff --git a/trunk/arch/powerpc/kernel/nvram_64.c b/trunk/arch/powerpc/kernel/nvram_64.c
index c67e0102df96..89d4af2a13ef 100644
--- a/trunk/arch/powerpc/kernel/nvram_64.c
+++ b/trunk/arch/powerpc/kernel/nvram_64.c
@@ -681,6 +681,9 @@ int nvram_clear_error_log(void)
 	int clear_word = ERR_FLAG_ALREADY_LOGGED;
 	int rc;
 
+	if (nvram_error_log_index == -1)
+		return -1;
+
 	tmp_index = nvram_error_log_index;
 	
 	rc = ppc_md.nvram_write((char *)&clear_word, sizeof(int), &tmp_index);