commit 17b23e2a16f9077e918d84a3dbe59b9fe7bcb3e1
author Elliott Hughes <enh@google.com> Mon Mar 30 19:39:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 30 19:39:02 2015 +0000
tree b521390434171fe4c025887edcc1e820fca64b89
parent 9d919e97d85f81a5d3113c1feb5fea2a71fa1d83
parent 2190bda167777d4d8279a9941be83bcfa281acc8

am 958af99e: am 42997bfe: am eb809351: Merge "Always unlink /dev/__kmsg__."

* commit '958af99e0e26af7267828020b73903a054855525':
  Always unlink /dev/__kmsg__.

libcutils/klog.c

diff --git a/libcutils/klog.c b/libcutils/klog.c
index fad2a8b..f574f08 100644
--- a/libcutils/klog.c
+++ b/libcutils/klog.c
@@ -40,12 +40,9 @@
 void klog_init(void) {
     if (klog_fd >= 0) return; /* Already initialized */
 
-    static const char *name = "/dev/__kmsg__";
+    static const char* name = "/dev/__kmsg__";
     if (mknod(name, S_IFCHR | 0600, (1 << 8) | 11) == 0) {
         klog_fd = open(name, O_WRONLY | O_CLOEXEC);
-        if (klog_fd == -1) {
-            return;
-        }
         unlink(name);
     }
 }