[linux]: Use LocationCapability if GetRegulatoryLocation fail (#23602)

* [linux]: Use LocationCapability if GetRegulatoryLocation fail * Address the review comment
project-chip · Nov 17, 2022 · b568009 · b568009
1 parent c76b258
commit b568009
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/platform/Linux/ConfigurationManagerImpl.cpp b/src/platform/Linux/ConfigurationManagerImpl.cpp
@@ -369,17 +369,23 @@ CHIP_ERROR ConfigurationManagerImpl::StoreBootReason(uint32_t bootReason)
 
 CHIP_ERROR ConfigurationManagerImpl::GetRegulatoryLocation(uint8_t & location)
 {
- uint32_t value = 0;
+ uint32_t value;
 
- CHIP_ERROR err = ReadConfigValue(PosixConfig::kConfigKey_RegulatoryLocation, value);
+ if (CHIP_NO_ERROR != ReadConfigValue(PosixConfig::kConfigKey_RegulatoryLocation, value))
+ {
+ ReturnErrorOnFailure(GetLocationCapability(location));
 
- if (err == CHIP_NO_ERROR)
+ if (CHIP_NO_ERROR != StoreRegulatoryLocation(location))
+ {
+ ChipLogError(DeviceLayer, "Failed to store RegulatoryLocation");
+ }
+ }
+ else
  {
- VerifyOrReturnError(value <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
  location = static_cast<uint8_t>(value);
  }
 
- return err;
+ return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ConfigurationManagerImpl::GetLocationCapability(uint8_t & location)