commit 05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c
author Nick Kralevich <nnk@google.com> Fri Jan 03 05:46:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 03 05:46:51 2014 +0000
tree 9b2a469b9d1d2d69af13a052abd6b3245da56ff2
parent 3e30f6afa042f3bba4822dc5d1ef267ed4b9d722
parent ceb1c5cdf0e484f7c2763b3c4ac1fe8b39a55be6

am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit 'ceb1c5cdf0e484f7c2763b3c4ac1fe8b39a55be6':
  toolbox-ls: re-introduce clobbered error message

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