diff options
| author | Jean Delvare <khali@linux-fr.org> | 2010-05-27 19:58:58 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2010-05-27 19:58:58 +0200 |
| commit | 8d4dee98b10050db9c32a449e460a2f69bb558ec (patch) | |
| tree | eb3eff50616859bffda22485f6f8f4a5a0bbe8b1 /drivers/hwmon/tmp102.c | |
| parent | cff37c9e82e022068840b3d33167e64c6a0ecc06 (diff) | |
| download | op-kernel-dev-8d4dee98b10050db9c32a449e460a2f69bb558ec.zip op-kernel-dev-8d4dee98b10050db9c32a449e460a2f69bb558ec.tar.gz | |
hwmon: (tmp102) Fix suspend and resume functions
Suspend and resume functions shouldn't overwrite the configuration
register. They should only alter the one bit they have to touch.
Also don't assume that register reads and writes always succeed.
Handle errors properly, shall they happen.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Steven King <sfking@fdwdc.com>
Diffstat (limited to 'drivers/hwmon/tmp102.c')
| -rw-r--r-- | drivers/hwmon/tmp102.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index e9de28d..0da695d 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -239,19 +239,27 @@ static int __devexit tmp102_remove(struct i2c_client *client) static int tmp102_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); + int config; - tmp102_write_reg(client, TMP102_CONF_REG, TMP102_CONF_SD); + config = tmp102_read_reg(client, TMP102_CONF_REG); + if (config < 0) + return config; - return 0; + config |= TMP102_CONF_SD; + return tmp102_write_reg(client, TMP102_CONF_REG, config); } static int tmp102_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); + int config; - tmp102_write_reg(client, TMP102_CONF_REG, TMP102_CONFIG); + config = tmp102_read_reg(client, TMP102_CONF_REG); + if (config < 0) + return config; - return 0; + config &= ~TMP102_CONF_SD; + return tmp102_write_reg(client, TMP102_CONF_REG, config); } static const struct dev_pm_ops tmp102_dev_pm_ops = { |
