---

yaml --- r: 350569 b: refs/heads/master c: 6e7d3b6 h: refs/heads/master i: 350567: 1bbf87d v: v3
git-mirror · Feb 20, 2013 · ad31800 · ad31800
1 parent 62fcc6e
commit ad31800
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d47682803776f147ee9662a505c63bbbf27a1274
+refs/heads/master: 6e7d3b6bb9af358b2bf05cccb025ac5d66630b47
diff --git a/trunk/drivers/hwmon/adt7410.c b/trunk/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) {