1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 975c95169884..84f61cec6319 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -649,8 +649,10 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
                                 if (info[i]->config[j] & HWMON_T_INPUT) {
                                         err = hwmon_thermal_add_sensor(dev,
                                                                 hwdev, j);
-                                        if (err)
-                                                goto free_device;
+                                        if (err) {
+                                                device_unregister(hdev);
+                                                goto ida_remove;
+                                        }
                                 }
                         }
                 }
@@ -658,8 +660,6 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
 
         return hdev;
 
-free_device:
-        device_unregister(hdev);
 free_hwmon:
         kfree(hwdev);
 ida_remove: