diff options
| author | Jean Delvare <khali@linux-fr.org> | 2010-03-05 22:17:14 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2010-03-05 22:17:14 +0100 |
| commit | 95238364167edaf93ce2890e5f55326b63194851 (patch) | |
| tree | 21a1c398b9102c74d38a61d22d34089e5697ccd1 /drivers/hwmon | |
| parent | 6771ea1fff988651593f78c122bc02e80f5100a0 (diff) | |
| download | linux-95238364167edaf93ce2890e5f55326b63194851.tar.bz2 | |
hwmon: (lm90) Restore configuration on exit
Restore the chip configuration when unloading the driver. This ensures
we don't leave the chip running if it was initially stopped.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/lm90.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index ddf617f3a713..4cbbf1563de6 100644 --- a/drivers/hwmon/lm90.c +++ b/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 <khali@linux-fr.org> + * Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> * * 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 @@ exit: 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; } |