commit 0191c801075c3a5218c69917e8488bcce38dce2b
author Colin Cross <ccross@android.com> Fri Dec 27 00:31:16 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 27 00:31:16 2013 +0000
tree 450948133fabf514bec09b953dbea631c696ee45
parent 9f34b141b301f15111de2ff0efb3d76379b46f1c
parent 7fa9afedc1b8cd1d2c5f01693b8ae50c6c212e6d

am 7fa9afed: am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4

* commit '7fa9afedc1b8cd1d2c5f01693b8ae50c6c212e6d':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h

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