From b105e8304d9dce282668747dfc9bc13f42ff8c5c Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Sun, 9 Sep 2007 17:35:34 +0200 Subject: [PATCH] --- yaml --- r: 68727 b: refs/heads/master c: bba891c24a77419e9dcf76f866bd0d8ecf66d770 h: refs/heads/master i: 68725: 25e372da0b57ad226d70a22ac38a40cd386b7bf0 68723: 906cc137e27a2f621e65420954f581156bf88c85 68719: a83300cbee3bad5fc338859b1feb22e37d608fed v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/thmc50.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 17c93741923d..b8c8a75643ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7f1f7166a83f8f5607cc03c7a6c5f936cde6b0d +refs/heads/master: bba891c24a77419e9dcf76f866bd0d8ecf66d770 diff --git a/trunk/drivers/hwmon/thmc50.c b/trunk/drivers/hwmon/thmc50.c index 981d1f1dc61f..f79c7504204e 100644 --- a/trunk/drivers/hwmon/thmc50.c +++ b/trunk/drivers/hwmon/thmc50.c @@ -47,10 +47,10 @@ I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs " #define THMC50_REG_DIE_CODE 0x3F #define THMC50_REG_ANALOG_OUT 0x19 /* - * We use mirror status register for reading alarms - * so ACPI can use the primary status register. + * The mirror status register cannot be used as + * reading it does not clear alarms. */ -#define THMC50_REG_INTR_MIRROR 0x4C +#define THMC50_REG_INTR 0x41 const static u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 }; const static u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C }; @@ -441,7 +441,7 @@ static struct thmc50_data *thmc50_update_device(struct device *dev) data->analog_out = i2c_smbus_read_byte_data(client, THMC50_REG_ANALOG_OUT); data->alarms = - i2c_smbus_read_byte_data(client, THMC50_REG_INTR_MIRROR); + i2c_smbus_read_byte_data(client, THMC50_REG_INTR); data->last_updated = jiffies; data->valid = 1; }