lkml.org 
[lkml]   [2011]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/16] asus-wmi: check for temp1 presence
    Date
    Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
    ---
    drivers/platform/x86/asus-wmi.c | 8 +++++++-
    1 files changed, 7 insertions(+), 1 deletions(-)

    diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
    index cc947cc..be9e89a 100644
    --- a/drivers/platform/x86/asus-wmi.c
    +++ b/drivers/platform/x86/asus-wmi.c
    @@ -967,7 +967,7 @@ static struct attribute *hwmon_attributes[] = {
    };

    static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
    - struct attribute *attr, int idx)
    + struct attribute *attr, int idx)
    {
    struct device *dev = container_of(kobj, struct device, kobj);
    struct platform_device *pdev = to_platform_device(dev->parent);
    @@ -978,6 +978,8 @@ static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,

    if (attr == &sensor_dev_attr_pwm1.dev_attr.attr)
    dev_id = ASUS_WMI_DEVID_FAN_CTRL;
    + else if (attr == &sensor_dev_attr_temp1_input.dev_attr.attr)
    + dev_id = ASUS_WMI_DEVID_THERMAL_CTRL;

    if (dev_id != -1) {
    int err = asus_wmi_get_devstate(asus, dev_id, &value);
    @@ -998,6 +1000,10 @@ static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
    if (value == ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000
    || (!asus->sfun && !(value & ASUS_WMI_DSTS_PRESENCE_BIT)))
    ok = false;
    + } else if (dev_id == ASUS_WMI_DEVID_THERMAL_CTRL) {
    + /* If value is zero, something is clearly wrong */
    + if (value == 0)
    + ok = false;
    }

    return ok ? attr->mode : 0;
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-07-01 11:41    [W:0.020 / U:0.380 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site