Skip to contentSkip to conversation

hwmon: (tmp102) Fix suspend and resume

PATCH New Jean Delvare 1 participant 1 message May 18, 2010 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 hwmon: (tmp102) Fix suspend and resume

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.

---
 drivers/hwmon/tmp102.c |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/hwmon/tmp102.c +12 -4
@@ -239,19 +239,27 @@ static int __devexit tmp102_remove(struc
 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 = {
Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors