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

Commit 32c6e258 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 fix from Guenter Roeck:
 "Fix chip initialization/configuration in MAX6697 driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (max6697) fix MAX6581 ideality
parents 9250d904 5c52add1

drivers/hwmon/max6697.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -605,12 +605,12 @@ static int max6697_init_chip(struct i2c_client *client) 
		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

		ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY,

		ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY,

						pdata->ideality_mask >> 1);

						pdata->ideality_value);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

		ret = i2c_smbus_write_byte_data(client,

		ret = i2c_smbus_write_byte_data(client,

						MAX6581_REG_IDEALITY_SELECT,

						MAX6581_REG_IDEALITY_SELECT,

						pdata->ideality_value);

						pdata->ideality_mask >> 1);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

	}

	}