commit ea91fb976ab842f3f41d9f3f25e988d70e51a77c
author Elliott Hughes <enh@google.com> Tue Jan 07 20:14:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 20:14:53 2014 +0000
tree 1963edfc2ff1be6d409996cf9db77eb1ab4057e1
parent b1b187f7c870a5267ef9d7a4476e281cd6ccffc7
parent 1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26

am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"

* commit '1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26':
  Dwarf backtrace for MIPS

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);