diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/hwmon/fscpos.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/hwmon/fscpos.c')
| -rw-r--r-- | drivers/hwmon/fscpos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c index 3beaa6191ef4..270015b626ad 100644 --- a/drivers/hwmon/fscpos.c +++ b/drivers/hwmon/fscpos.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/jiffies.h> | ||
| 35 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
| 36 | #include <linux/i2c-sensor.h> | 37 | #include <linux/i2c-sensor.h> |
| 37 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| @@ -572,8 +573,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev) | |||
| 572 | 573 | ||
| 573 | down(&data->update_lock); | 574 | down(&data->update_lock); |
| 574 | 575 | ||
| 575 | if ((jiffies - data->last_updated > 2 * HZ) || | 576 | if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { |
| 576 | (jiffies < data->last_updated) || !data->valid) { | ||
| 577 | int i; | 577 | int i; |
| 578 | 578 | ||
| 579 | dev_dbg(&client->dev, "Starting fscpos update\n"); | 579 | dev_dbg(&client->dev, "Starting fscpos update\n"); |