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

Commit 7b837786 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:
 "Two minor fixes in emc2103 and applesmc drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (emc2103) Fix use of an uninitilized variable in error case
  hwmon: (applesmc) Limit key length in warning messages
parents 7940b2ad 2355375e

drivers/hwmon/applesmc.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) 
	int i;



	if (send_command(cmd) || send_argument(key)) {

		pr_warn("%s: read arg fail\n", key);

		pr_warn("%.4s: read arg fail\n", key);

		return -EIO;

	}
@@ -223,7 +223,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) 


	for (i = 0; i < len; i++) {

		if (__wait_status(0x05)) {

			pr_warn("%s: read data fail\n", key);

			pr_warn("%.4s: read data fail\n", key);

			return -EIO;

		}

		buffer[i] = inb(APPLESMC_DATA_PORT);

drivers/hwmon/emc2103.c

+8 −4
Original line number Diff line number Diff line
@@ -451,11 +451,15 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, 
		data->fan_rpm_control = true;

		break;

	default:

		mutex_unlock(&data->update_lock);

		return -EINVAL;

		count = -EINVAL;

		goto err;

	}



	read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);

	result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);

	if (result) {

		count = result;

		goto err;

	}



	if (data->fan_rpm_control)

		conf_reg |= 0x80;
@@ -463,7 +467,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, 
		conf_reg &= ~0x80;



	i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg);



err:

	mutex_unlock(&data->update_lock);

	return count;

}