dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

px4_shutdown_request: make sure we release the lock in every case 

board_shutdown should not return, but just in case
This commit is contained in:
Beat Küng 2017-07-25 11:44:56 +02:00 committed by Lorenz Meier
parent b89deaf8e3
commit b1215a6ddd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platforms/common/shutdown.cpp
View File

@ -94,6 +94,7 @@ int px4_unregister_shutdown_hook(shutdown_hook_t hook)
int px4_shutdown_request(bool reboot, bool to_bootloader)
{
int ret = 0;
pthread_mutex_lock(&shutdown_mutex);
// FIXME: if shutdown_lock_counter > 0, we should wait, but unfortunately we don't have work queues
@ -101,12 +102,12 @@ int px4_shutdown_request(bool reboot, bool to_bootloader)
px4_systemreset(to_bootloader);
} else {
return board_shutdown();
ret = board_shutdown();
}
pthread_mutex_unlock(&shutdown_mutex);
return 0;
return ret;
}
#else