Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 18:06:39 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixed up nullptr handling

Browse Source
This commit is contained in:
Lorenz Meier
2014-02-05 09:34:21 +01:00
parent 1ef7320e0c
commit 94b162d0e0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/mkblctrl/mkblctrl.cpp
+11 -5
View File
@@ -1176,8 +1176,11 @@ mk_start(unsigned motors, char *device_path)
// try i2c3 first // try i2c3 first
g_mk = new MK(3, device_path); g_mk = new MK(3, device_path);
if (g_mk && OK == g_mk->init(motors)) { if (!g_mk)
fprintf(stderr, "[mkblctrl] scanning i2c3...\n"); return -ENOMEM;
if (OK == g_mk->init(motors)) {
warnx("[mkblctrl] scanning i2c3...\n");
ret = g_mk->mk_check_for_blctrl(8, false, true); ret = g_mk->mk_check_for_blctrl(8, false, true);
if (ret > 0) { if (ret > 0) {
return OK; return OK;
@@ -1190,8 +1193,11 @@ mk_start(unsigned motors, char *device_path)
// fallback to bus 1 // fallback to bus 1
g_mk = new MK(1, device_path); g_mk = new MK(1, device_path);
if (g_mk && OK == g_mk->init(motors)) { if (!g_mk)
fprintf(stderr, "[mkblctrl] scanning i2c1...\n"); return -ENOMEM;
if (OK == g_mk->init(motors)) {
warnx("[mkblctrl] scanning i2c1...\n");
ret = g_mk->mk_check_for_blctrl(8, false, true); ret = g_mk->mk_check_for_blctrl(8, false, true);
if (ret > 0) { if (ret > 0) {
return OK; return OK;
@@ -1201,7 +1207,7 @@ mk_start(unsigned motors, char *device_path)
delete g_mk; delete g_mk;
g_mk = nullptr; g_mk = nullptr;
return -ENOMEM; return -ENXIO;
} }