commit 218878d447b58b357f0dc97bfe6b77196d35a729
author Nick Kralevich <nnk@google.com> Wed Jan 08 23:45:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 08 23:45:53 2014 +0000
tree 7db0a8df9b92f733f3666acfe5543d01fe464a62
parent 16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd
parent df8d0ffd73f8359def90d2f79d25059023018213

am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit 'df8d0ffd73f8359def90d2f79d25059023018213':
  Label existing /data/mediadrm files.

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