openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jean Delvare 2010-05-27 19:58:58 +02:00
parent cff37c9e82
commit 8d4dee98b1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/hwmon/tmp102.c
View File

@ -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 = {