commit c37fec6d61dc2650a0a92983dc8d577f9e19520d
author Christopher Ferris <cferris@google.com> Sat Jan 11 00:29:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 11 00:29:01 2014 +0000
tree 46e96da3a9b8cd2a8c4b71cf3c1776c003e9b28f
parent 596bfe67eb5d223ef18edb9a5416d5c7353f9036
parent 715752cdbe5abb444f9c90769f7edb38ef52adb2

am 715752cd: am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."

* commit '715752cdbe5abb444f9c90769f7edb38ef52adb2':
  Move to C++ for debuggerd.

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