diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-25 16:16:15 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-29 16:33:52 +0100 |
| commit | 7932e2eda238b1d480fdc9de71bb1b5fcaa3e373 (patch) | |
| tree | 48524220e4b08813342192da6e07ef1285bac793 | |
| parent | 8de411619a0ce05cc9f34f5a9f756908dbd21db8 (diff) | |
| download | px4-firmware-7932e2eda238b1d480fdc9de71bb1b5fcaa3e373.tar.gz px4-firmware-7932e2eda238b1d480fdc9de71bb1b5fcaa3e373.tar.bz2 px4-firmware-7932e2eda238b1d480fdc9de71bb1b5fcaa3e373.zip | |
Add top to test build
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 | ||||
| -rw-r--r-- | src/modules/uORB/uORB.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index bc6723e5f..91fc2a751 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -32,6 +32,7 @@ MODULES += systemcmds/tests MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/ver +MODULES += systemcmds/top # # Testing modules diff --git a/src/modules/uORB/uORB.cpp b/src/modules/uORB/uORB.cpp index cfea12f04..c4de996bb 100644 --- a/src/modules/uORB/uORB.cpp +++ b/src/modules/uORB/uORB.cpp @@ -641,9 +641,13 @@ ORBDevMaster::ioctl(struct file *filp, int cmd, unsigned long arg) if (ret != OK) { delete node; free((void *)objname); + free((void *)devpath); } - } while (ret != OK && (group_tries++ < max_group_tries)); + /* try with next larger index */ + group_tries++; + + } while (ret != OK && (group_tries < max_group_tries)); if (group_tries >= max_group_tries) { ret = -ENOMEM; |