From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 15 Feb 2013 16:57:10 +0000 (+0100)
Subject: hwmon: (adt7410) Clear unwanted bits in the config register
X-Git-Tag: MMI-PSA29.97-13-9~15026^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e7d3b6bb9af358b2bf05cccb025ac5d66630b47;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

hwmon: (adt7410) Clear unwanted bits in the config register

Make sure to clear the mode bits from the config register before setting the new
mode. Otherwise we might end up with a different mode than we want to.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/drivers/hwmon/adt7410.c b/drivers/hwmon/adt7410.c
index 797c2b85c483..4ccee4fbfd73 100644
--- a/drivers/hwmon/adt7410.c
+++ b/drivers/hwmon/adt7410.c
@@ -364,6 +364,7 @@ static int adt7410_probe(struct i2c_client *client,
 	/*
 	 * Set to 16 bit resolution, continous conversion and comparator mode.
 	 */
+	ret &= ~ADT7410_MODE_MASK;
 	data->config = ret | ADT7410_FULL | ADT7410_RESOLUTION |
 			ADT7410_EVENT_MODE;
 	if (data->config != data->oldconfig) {