commit 31ec7dbb6ae668b4c7bb4f9d630f80253b23f0d8
author Matt Spinler <spinler@us.ibm.com> Mon Apr 11 16:49:40 2022 -0500
committer Ed Tanous <ed@tanous.net> Wed Apr 13 18:28:23 2022 +0000
tree 391e574eba74cc2568821639308f4f3d1f4d2b19
parent fefdbe7f5124c00a9b05c2c2bad9d560692f7025

Revert "hwmon-temp-sensor: Support sensor with missing labels"

It turns out this commit results in ignoring the humidity/pressure
sensor for IIO devices that provide both temperature and a different
type.

It happens because the same device has multiple entries in the 'paths'
variable since they are added here:

findFiles(root, R"(in_temp\d*_(input|raw))", paths);
findFiles(root, R"(in_pressure\d*_(input|raw))", paths);
findFiles(root, R"(in_humidityrelative\d*_(input|raw))", paths);

and then this change would remove the config entry for the device before
it could process the other paths.

This reverts commit 0f580944e22534c8814634d76bd752a5d4236f60.

Change-Id: I22b4336101fae7782c650b9cf5f515dbbdacca9e
Signed-off-by: Matt Spinler <spinler@us.ibm.com>

src/HwmonTempMain.cpp

diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index 166e407..bdb0ea2 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -478,7 +478,10 @@
                                         hwmonName.end());
                     }
                 }
-                configMap.erase(findSensorCfg);
+                if (hwmonName.empty())
+                {
+                    configMap.erase(findSensorCfg);
+                }
             }
         });
     getter->getConfiguration(