redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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
hifive-unleashed-5.1
Linus Torvalds 2013-07-10 11:04:38 -07:00
parent 50aaa6bc04 5b0620df9c
commit dc5ef1f569
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hwmon/lm63.c
View File

@ -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 */

4
drivers/hwmon/lm90.c
View File

@ -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;