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

Commit 77d92784 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon fixes from Guenter Roeck:
 "Fix resource leak as well as broken store function in emc1403 driver,
  and add support for additional chip revisions"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (emc1403) Support full range of known chip revision numbers
  hwmon: (emc1403) Fix resource leak on module unload
  hwmon: (emc1403) fix inverted store_hyst()
parents 68cb363a 3a18e139

drivers/hwmon/emc1403.c

+5 −5
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static ssize_t store_hyst(struct device *dev, 
	if (retval < 0)

		goto fail;



	hyst = val - retval * 1000;

	hyst = retval * 1000 - val;

	hyst = DIV_ROUND_CLOSEST(hyst, 1000);

	if (hyst < 0 || hyst > 255) {

		retval = -ERANGE;
@@ -330,7 +330,7 @@ static int emc1403_detect(struct i2c_client *client, 
	}



	id = i2c_smbus_read_byte_data(client, THERMAL_REVISION_REG);

	if (id != 0x01)

	if (id < 0x01 || id > 0x04)

		return -ENODEV;



	return 0;
@@ -355,7 +355,7 @@ static int emc1403_probe(struct i2c_client *client, 
	if (id->driver_data)

		data->groups[1] = &emc1404_group;



	hwmon_dev = hwmon_device_register_with_groups(&client->dev,

	hwmon_dev = devm_hwmon_device_register_with_groups(&client->dev,

							   client->name, data,

							   data->groups);

	if (IS_ERR(hwmon_dev))