hwmon: (ibmaem) Fix error paths

I am under the impression that error paths in functions
aem_init_aem1_inst() and aem_init_aem2_inst() are incorrect. In
several cases, the function returns 0 on error, which I suspect is
not intended. Fix this by properly tracking error codes.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index 783d0c17b762..aba6b59dc3a5 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -570,24 +570,26 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
         platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
-        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
-                               probe->bmc_device))
+        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
+                                 probe->bmc_device);
+        if (res)
                 goto ipmi_err;
 
         /* Register with hwmon */
         data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
-
         if (IS_ERR(data->hwmon_dev)) {
                 dev_err(&data->pdev->dev, "Unable to register hwmon "
                         "device for IPMI interface %d\n",
                         probe->interface);
+                res = PTR_ERR(data->hwmon_dev);
                 goto hwmon_reg_err;
         }
 
         data->update = update_aem1_sensors;
 
         /* Find sensors */
-        if (aem1_find_sensors(data))
+        res = aem1_find_sensors(data);
+        if (res)
                 goto sensor_err;
 
         /* Add to our list of AEM devices */
@@ -704,24 +706,26 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
         platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
-        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
-                               probe->bmc_device))
+        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
+                                 probe->bmc_device);
+        if (res)
                 goto ipmi_err;
 
         /* Register with hwmon */
         data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
-
         if (IS_ERR(data->hwmon_dev)) {
                 dev_err(&data->pdev->dev, "Unable to register hwmon "
                         "device for IPMI interface %d\n",
                         probe->interface);
+                res = PTR_ERR(data->hwmon_dev);
                 goto hwmon_reg_err;
         }
 
         data->update = update_aem2_sensors;
 
         /* Find sensors */
-        if (aem2_find_sensors(data))
+        res = aem2_find_sensors(data);
+        if (res)
                 goto sensor_err;
 
         /* Add to our list of AEM devices */