commit 4639ae452e7d22343053c5127ecb44ef19b7baf2
author Nick Kralevich <nnk@google.com> Thu Dec 19 18:42:56 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 19 18:42:56 2013 +0000
tree e1f244159b7be70311d2cbb5b874d8e60efa63ea
parent 137ab19a0a196a419636b078f94aef23b1172335
parent a0ce4e288073b744a02e4301e7ec069346c416d7

am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit 'a0ce4e288073b744a02e4301e7ec069346c416d7':
  adb: Check sender's socket id when receiving packets.

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