From c3a68ad9ec3edefacdbef9216dca3aca0c0536ef Mon Sep 17 00:00:00 2001 From: Luca Tettamanti Date: Tue, 28 Jul 2009 16:31:39 +0200 Subject: [PATCH] --- yaml --- r: 155933 b: refs/heads/master c: 8d282497cbf8124d6814d51a74fb13d69531c669 h: refs/heads/master i: 155931: 42511b4a7427258b3af3161af64fa79a0d64c64b v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/asus_atk0110.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef52cf3c29d5..041426591c14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b54ab450b180eaeeb0eee6f0f64349246a22c14 +refs/heads/master: 8d282497cbf8124d6814d51a74fb13d69531c669 diff --git a/trunk/drivers/hwmon/asus_atk0110.c b/trunk/drivers/hwmon/asus_atk0110.c index bff0103610c1..fe4fa29c9219 100644 --- a/trunk/drivers/hwmon/asus_atk0110.c +++ b/trunk/drivers/hwmon/asus_atk0110.c @@ -593,7 +593,11 @@ static int atk_add_sensor(struct atk_data *data, union acpi_object *obj) sensor->data = data; sensor->id = flags->integer.value; sensor->limit1 = limit1->integer.value; - sensor->limit2 = limit2->integer.value; + if (data->old_interface) + sensor->limit2 = limit2->integer.value; + else + /* The upper limit is expressed as delta from lower limit */ + sensor->limit2 = sensor->limit1 + limit2->integer.value; snprintf(sensor->input_attr_name, ATTR_NAME_SIZE, "%s%d_input", base_name, start + *num);