Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d4dee98 authored by Jean Delvare's avatar Jean Delvare
Browse files

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: default avatarJean Delvare <khali@linux-fr.org>
Cc: Steven King <sfking@fdwdc.com>
parent cff37c9e

drivers/hwmon/tmp102.c

+12 −4
Original line number Diff line number Diff line
@@ -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 = {