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

Commit 81ae6814 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (pmbus) Improve fan detection 



Some PMBus devices return no error when reading fan speed registers, but don't
really support fans. Strengthen fan detection by also checking if fan
configuration registers exist.

Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: default avatarRobert Coulson <robert.coulson@ericsson.com>
Cc: stable.kernel.org # 2.6.39
parent 3b33ca41

drivers/hwmon/pmbus.c

+4 −2
Original line number Diff line number Diff line
@@ -47,12 +47,14 @@ static void pmbus_find_sensor_groups(struct i2c_client *client, 
	if (info->func[0]

	    && pmbus_check_byte_register(client, 0, PMBUS_STATUS_INPUT))

		info->func[0] |= PMBUS_HAVE_STATUS_INPUT;

	if (pmbus_check_word_register(client, 0, PMBUS_READ_FAN_SPEED_1)) {

	if (pmbus_check_byte_register(client, 0, PMBUS_FAN_CONFIG_12) &&

	    pmbus_check_word_register(client, 0, PMBUS_READ_FAN_SPEED_1)) {

		info->func[0] |= PMBUS_HAVE_FAN12;

		if (pmbus_check_byte_register(client, 0, PMBUS_STATUS_FAN_12))

			info->func[0] |= PMBUS_HAVE_STATUS_FAN12;

	}

	if (pmbus_check_word_register(client, 0, PMBUS_READ_FAN_SPEED_3)) {

	if (pmbus_check_byte_register(client, 0, PMBUS_FAN_CONFIG_34) &&

	    pmbus_check_word_register(client, 0, PMBUS_READ_FAN_SPEED_3)) {

		info->func[0] |= PMBUS_HAVE_FAN34;

		if (pmbus_check_byte_register(client, 0, PMBUS_STATUS_FAN_34))

			info->func[0] |= PMBUS_HAVE_STATUS_FAN34;