commit 1a474d0e5c08ea8fedef967ca516db07431260bd
author jp abgrall <jpa@google.com> Wed Sep 12 15:36:03 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 12 15:36:03 2012 -0700
tree 250dc4716a50b04fe102371a42f9692ecb9e8182
parent 3c644f5847d15bb7081efbb8c50400af3a16bd00
parent ddf62a13a066039782e4cb67c256b1489c46ed1f

am ddf62a13: am 40cdfe48: am 78b00d81: Merge "Don\'t include <linux/...> header files directly."

* commit 'ddf62a13a066039782e4cb67c256b1489c46ed1f':
  Don't include <linux/...> header files directly.

TetherController.cpp

diff --git a/TetherController.cpp b/TetherController.cpp
index 5f571a1..cb48dbc 100644
--- a/TetherController.cpp
+++ b/TetherController.cpp
@@ -158,8 +158,7 @@
             ALOGE("execl failed (%s)", strerror(errno));
         }
         ALOGE("Should never get here!");
-        free(args);
-        return 0;
+        _exit(-1);
     } else {
         close(pipefd[0]);
         mDaemonPid = pid;
@@ -233,7 +232,7 @@
         // TODO(BT) inform parent of the failure.
         //          Parent process need wait for child to report error status
         //          before it set mDhcpcdPid and return 0.
-        exit(-1);
+        _exit(-1);
     } else {
         mDhcpcdPid = pid;
         ALOGD("Reverse Tethering running, pid:%d", pid);