From 4e836685c1cd93cc98e48ff6254dff3e7f6dee2d Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 5 Mar 2010 22:17:14 +0100 Subject: [PATCH] --- yaml --- r: 186398 b: refs/heads/master c: 95238364167edaf93ce2890e5f55326b63194851 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/lm90.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4736a0cb2e27..c00f4f6d5a35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6771ea1fff988651593f78c122bc02e80f5100a0 +refs/heads/master: 95238364167edaf93ce2890e5f55326b63194851 diff --git a/trunk/drivers/hwmon/lm90.c b/trunk/drivers/hwmon/lm90.c index ddf617f3a713..4cbbf1563de6 100644 --- a/trunk/drivers/hwmon/lm90.c +++ b/trunk/drivers/hwmon/lm90.c @@ -1,7 +1,7 @@ /* * lm90.c - Part of lm_sensors, Linux kernel modules for hardware * monitoring - * Copyright (C) 2003-2009 Jean Delvare + * Copyright (C) 2003-2010 Jean Delvare * * Based on the lm83 driver. The LM90 is a sensor chip made by National * Semiconductor. It reports up to two temperatures (its own plus up to @@ -203,6 +203,8 @@ struct lm90_data { int kind; int flags; + u8 config_orig; /* Original configuration register value */ + /* registers values */ s8 temp8[4]; /* 0: local low limit 1: local high limit @@ -840,7 +842,7 @@ static int lm90_probe(struct i2c_client *new_client, static void lm90_init_client(struct i2c_client *client) { - u8 config, config_orig; + u8 config; struct lm90_data *data = i2c_get_clientdata(client); /* @@ -852,7 +854,7 @@ static void lm90_init_client(struct i2c_client *client) dev_warn(&client->dev, "Initialization failed!\n"); return; } - config_orig = config; + data->config_orig = config; /* Check Temperature Range Select */ if (data->kind == adt7461) { @@ -870,7 +872,7 @@ static void lm90_init_client(struct i2c_client *client) } config &= 0xBF; /* run */ - if (config != config_orig) /* Only write if changed */ + if (config != data->config_orig) /* Only write if changed */ i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, config); } @@ -885,6 +887,10 @@ static int lm90_remove(struct i2c_client *client) device_remove_file(&client->dev, &sensor_dev_attr_temp2_offset.dev_attr); + /* Restore initial configuration */ + i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, + data->config_orig); + kfree(data); return 0; }