From a152fb65cb2f9aba1679847952f28071fca51776 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 16 Dec 2020 10:50:05 -0500 Subject: [PATCH] parameters: remove unnecessary duplicated shutdown lock in param_save_default() - param_export already takes the shutdown lock --- src/lib/parameters/parameters.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/lib/parameters/parameters.cpp b/src/lib/parameters/parameters.cpp index d76deb5a6e..433cc52e6a 100644 --- a/src/lib/parameters/parameters.cpp +++ b/src/lib/parameters/parameters.cpp @@ -979,22 +979,12 @@ int param_save_default() return res; } - int shutdown_lock_ret = px4_shutdown_lock(); - - if (shutdown_lock_ret) { - PX4_ERR("px4_shutdown_lock() failed (%i)", shutdown_lock_ret); - } - /* write parameters to temp file */ int fd = PARAM_OPEN(filename, O_WRONLY | O_CREAT, PX4_O_MODE_666); if (fd < 0) { PX4_ERR("failed to open param file: %s", filename); - if (shutdown_lock_ret == 0) { - px4_shutdown_unlock(); - } - return PX4_ERROR; } @@ -1016,10 +1006,6 @@ int param_save_default() PARAM_CLOSE(fd); - if (shutdown_lock_ret == 0) { - px4_shutdown_unlock(); - } - return res; }