From ab9f4eab72df289d8d160082287112195e4604b7 Mon Sep 17 00:00:00 2001 From: michael-west Date: Thu, 3 Sep 2020 12:32:49 -0700 Subject: lib: Remove recursive locks in apply_corrections There were locks in the apply_tx/rx_fe_corrections() methods that were acquired before calling methods that re-acquired the locks. The mutexes were not recursive, so it caused applications to lock up. The locks are unnecessary in the top level methods, so they are being removed. Signed-off-by: michael-west --- host/lib/usrp/common/apply_corrections.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'host/lib/usrp/common') diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp index 3cdf3d29f..762a9018b 100644 --- a/host/lib/usrp/common/apply_corrections.cpp +++ b/host/lib/usrp/common/apply_corrections.cpp @@ -175,8 +175,6 @@ void uhd::usrp::apply_tx_fe_corrections( const double lo_freq // actual lo freq ) { - std::lock_guard l(corrections_mutex); - // extract eeprom serial const uhd::fs_path db_path = "dboards/" + slot + "/tx_eeprom"; const std::string db_serial = @@ -192,7 +190,6 @@ void uhd::usrp::apply_rx_fe_corrections( const double lo_freq // actual lo freq ) { - std::lock_guard l(corrections_mutex); const uhd::fs_path db_path = "dboards/" + slot + "/rx_eeprom"; const std::string db_serial = sub_tree->access(db_path).get().serial; -- cgit v1.2.3