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

Commit dc5ef1f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon update from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm63) Drop redundant safety on cache lifetime
  hwmon: (lm90) Drop redundant safety on cache lifetime
parents 50aaa6bc 5b0620df

drivers/hwmon/lm63.c

+2 −3
Original line number Diff line number Diff line
@@ -247,9 +247,8 @@ static struct lm63_data *lm63_update_device(struct device *dev) 


	mutex_lock(&data->update_lock);



	next_update = data->last_updated

	  + msecs_to_jiffies(data->update_interval) + 1;



	next_update = data->last_updated +

		      msecs_to_jiffies(data->update_interval);

	if (time_after(jiffies, next_update) || !data->valid) {

		if (data->config & 0x04) { /* tachometer enabled  */

			/* order matters for fan1_input */

drivers/hwmon/lm90.c

+2 −2
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ static struct lm90_data *lm90_update_device(struct device *dev) 


	mutex_lock(&data->update_lock);



	next_update = data->last_updated

	  + msecs_to_jiffies(data->update_interval) + 1;

	next_update = data->last_updated +

		      msecs_to_jiffies(data->update_interval);

	if (time_after(jiffies, next_update) || !data->valid) {

		u8 h, l;

		u8 alarms;