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

Commit 791432cf authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Guenter Roeck
Browse files

hwmon: (max31790) Fix dereference of ERR_PTR 



max31790_update_device() return the error code in ERR_PTR. We were
checking if it has returned error or not but before checking we have
dereferenced it.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 195a4b42

drivers/hwmon/max31790.c

+4 −4
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ static ssize_t get_fan(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct max31790_data *data = max31790_update_device(dev);

	int sr = get_tach_period(data->fan_dynamics[attr->index]);

	int rpm;

	int sr, rpm;



	if (IS_ERR(data))

		return PTR_ERR(data);



	sr = get_tach_period(data->fan_dynamics[attr->index]);

	rpm = RPM_FROM_REG(data->tach[attr->index], sr);



	return sprintf(buf, "%d\n", rpm);
@@ -190,12 +190,12 @@ static ssize_t get_fan_target(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct max31790_data *data = max31790_update_device(dev);

	int sr = get_tach_period(data->fan_dynamics[attr->index]);

	int rpm;

	int sr, rpm;



	if (IS_ERR(data))

		return PTR_ERR(data);



	sr = get_tach_period(data->fan_dynamics[attr->index]);

	rpm = RPM_FROM_REG(data->target_count[attr->index], sr);



	return sprintf(buf, "%d\n", rpm);