diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/hwmon/lm90.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/hwmon/lm90.c')
| -rw-r--r-- | drivers/hwmon/lm90.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 812781c655a7..c43b4e9f96a9 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c | |||
| @@ -356,7 +356,7 @@ static int lm90_read16(struct i2c_client *client, u8 regh, u8 regl, u16 *value) | |||
| 356 | /* | 356 | /* |
| 357 | * There is a trick here. We have to read two registers to have the | 357 | * There is a trick here. We have to read two registers to have the |
| 358 | * sensor temperature, but we have to beware a conversion could occur | 358 | * sensor temperature, but we have to beware a conversion could occur |
| 359 | * inbetween the readings. The datasheet says we should either use | 359 | * between the readings. The datasheet says we should either use |
| 360 | * the one-shot conversion register, which we don't want to do | 360 | * the one-shot conversion register, which we don't want to do |
| 361 | * (disables hardware monitoring) or monitor the busy bit, which is | 361 | * (disables hardware monitoring) or monitor the busy bit, which is |
| 362 | * impossible (we can't read the values and monitor that bit at the | 362 | * impossible (we can't read the values and monitor that bit at the |