diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-30 17:05:21 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-30 17:05:21 +0200 |
commit | e2b602339adef80af84d6d396adc1962b1f86826 (patch) | |
tree | aa2eee1a485f885287436a82b951f3b8639f313b | |
parent | 61936412f3ccf9aff5a12d47b8c5fe34ff1a04fb (diff) | |
download | px4-firmware-e2b602339adef80af84d6d396adc1962b1f86826.tar.gz px4-firmware-e2b602339adef80af84d6d396adc1962b1f86826.tar.bz2 px4-firmware-e2b602339adef80af84d6d396adc1962b1f86826.zip |
Cleanup of detect return
-rw-r--r-- | src/drivers/px4io/px4io.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 1fa3fbbfb..026b87949 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1966,18 +1966,16 @@ detect(int argc, char *argv[]) if (g_dev == nullptr) errx(1, "driver alloc failed"); - if (OK != g_dev->detect()) { - delete g_dev; - g_dev = nullptr; - exit(1); - } + ret = g_dev->detect() - if (g_dev != nullptr) { - delete g_dev; - g_dev = nullptr; - } + delete g_dev; + g_dev = nullptr; - exit(0); + if (ret) + /* nonzero, error */ + exit(1); + else + exit(0); } void |