diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:04:38 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:04:38 (GMT) |
| commit | dc5ef1f56968c67e81ad1c81ab7dce678f480285 (patch) | |
| tree | 347202387bababc24574216cc9d07040baa74952 | |
| parent | 50aaa6bc047ab3b20321c2a1fdc224401fcd899d (diff) | |
| parent | 5b0620df9c38438ee245a97b8102ed74556e5505 (diff) | |
| download | linux-fsl-qoriq-dc5ef1f56968c67e81ad1c81ab7dce678f480285.tar.xz | |
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
| -rw-r--r-- | drivers/hwmon/lm63.c | 5 | ||||
| -rw-r--r-- | drivers/hwmon/lm90.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index f644a2e..d0def50 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c @@ -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 */ diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 8eeb141..cdff742 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -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; |