diff --git a/[refs] b/[refs] index 9666f55e28c9..e32ae2d71da1 100644 --- 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 index 797c2b85c483..4ccee4fbfd73 100644 --- 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) {