commit 596bfe67eb5d223ef18edb9a5416d5c7353f9036
author Christopher Ferris <cferris@google.com> Fri Jan 10 23:07:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 10 23:07:37 2014 +0000
tree 9ea37f7b0af3f4e3e80c5a52cff903c5e85f9961
parent 7fd0ea9bb19dd0136706dab02454f9a642807a07
parent 5f662c3320d1c30495884ac66123666d8fd92933

am 5f662c33: am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."

* commit '5f662c3320d1c30495884ac66123666d8fd92933':
  Init the abort_msg_address value.

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index dda24ae..66ddeaf 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,7 +67,6 @@
 #define BATTERY_FULL_THRESH     95
 
 #define LAST_KMSG_PATH          "/proc/last_kmsg"
-#define LAST_KMSG_PSTORE_PATH   "/sys/fs/pstore/console-ramoops"
 #define LAST_KMSG_MAX_SZ        (32 * 1024)
 
 #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -212,14 +211,10 @@
     LOGI("\n");
     LOGI("*************** LAST KMSG ***************\n");
     LOGI("\n");
-    buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
-
+    buf = load_file(LAST_KMSG_PATH, &sz);
     if (!buf || !sz) {
-        buf = load_file(LAST_KMSG_PATH, &sz);
-        if (!buf || !sz) {
-            LOGI("last_kmsg not found. Cold reset?\n");
-            goto out;
-        }
+        LOGI("last_kmsg not found. Cold reset?\n");
+        goto out;
     }
 
     len = min(sz, LAST_KMSG_MAX_SZ);