commit 687ec9b5e143aa92de008efcaa7b5750eeab87ef
author Elliott Hughes <enh@google.com> Fri Jan 03 21:14:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 03 21:14:46 2014 +0000
tree fb6fa6bb618278a0c2a9d78a31f49ef1dfb98fed
parent 42fb1783a67a46bd00f946002b6bbc7116d9bc78
parent a166bea18ffd304163bddec4701904d91541f527

am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit 'a166bea18ffd304163bddec4701904d91541f527':
  Fix a sporadic build breakage.

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 66ddeaf..dda24ae 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,6 +67,7 @@
 #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)
@@ -211,10 +212,14 @@
     LOGI("\n");
     LOGI("*************** LAST KMSG ***************\n");
     LOGI("\n");
-    buf = load_file(LAST_KMSG_PATH, &sz);
+    buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
+
     if (!buf || !sz) {
-        LOGI("last_kmsg not found. Cold reset?\n");
-        goto out;
+        buf = load_file(LAST_KMSG_PATH, &sz);
+        if (!buf || !sz) {
+            LOGI("last_kmsg not found. Cold reset?\n");
+            goto out;
+        }
     }
 
     len = min(sz, LAST_KMSG_MAX_SZ);