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

Commit beacbc68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.15-rc6' of... 

Merge tag 'hwmon-for-linus-v4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Handle errors from thermal subsystem"

* tag 'hwmon-for-linus-v4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Deal with errors from the thermal subsystem
parents e2a93007 47c332de

drivers/hwmon/hwmon.c

+17 −4
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static int hwmon_thermal_add_sensor(struct device *dev, 
				    struct hwmon_device *hwdev, int index)

{

	struct hwmon_thermal_data *tdata;

	struct thermal_zone_device *tzd;



	tdata = devm_kzalloc(dev, sizeof(*tdata), GFP_KERNEL);

	if (!tdata)
@@ -151,8 +152,14 @@ static int hwmon_thermal_add_sensor(struct device *dev, 
	tdata->hwdev = hwdev;

	tdata->index = index;



	devm_thermal_zone_of_sensor_register(&hwdev->dev, index, tdata,

	tzd = devm_thermal_zone_of_sensor_register(&hwdev->dev, index, tdata,

						   &hwmon_thermal_ops);

	/*

	 * If CONFIG_THERMAL_OF is disabled, this returns -ENODEV,

	 * so ignore that error but forward any other error.

	 */

	if (IS_ERR(tzd) && (PTR_ERR(tzd) != -ENODEV))

		return PTR_ERR(tzd);



	return 0;

}
@@ -621,14 +628,20 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, 
				if (!chip->ops->is_visible(drvdata, hwmon_temp,

							   hwmon_temp_input, j))

					continue;

				if (info[i]->config[j] & HWMON_T_INPUT)

					hwmon_thermal_add_sensor(dev, hwdev, j);

				if (info[i]->config[j] & HWMON_T_INPUT) {

					err = hwmon_thermal_add_sensor(dev,

								hwdev, j);

					if (err)

						goto free_device;

				}

			}

		}

	}



	return hdev;



free_device:

	device_unregister(hdev);

free_hwmon:

	kfree(hwdev);

ida_remove: