1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 0b1c82ad6805..b6353d61fac5 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -469,22 +469,35 @@ temp_crit_show(struct device *dev, struct device_attribute *attr,
 }
 
 
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+static struct thermal_hwmon_device *
+thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
 {
         struct thermal_hwmon_device *hwmon;
-        int new_hwmon_device = 1;
-        int result;
 
         mutex_lock(&thermal_list_lock);
         list_for_each_entry(hwmon, &thermal_hwmon_list, node)
                 if (!strcmp(hwmon->type, tz->type)) {
-                        new_hwmon_device = 0;
                         mutex_unlock(&thermal_list_lock);
-                        goto register_sys_interface;
+                        return hwmon;
                 }
         mutex_unlock(&thermal_list_lock);
 
+        return NULL;
+}
+
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+        struct thermal_hwmon_device *hwmon;
+        int new_hwmon_device = 1;
+        int result;
+
+        hwmon = thermal_hwmon_lookup_by_type(tz);
+        if (hwmon) {
+                new_hwmon_device = 0;
+                goto register_sys_interface;
+        }
+
         hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
         if (!hwmon)
                 return -ENOMEM;