Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 547a1c99 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

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: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 24d6e2a8

drivers/hwmon/ibmaem.c

+12 −8
Original line number Diff line number Diff line
@@ -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 */