lkml.org 
[lkml]   [2011]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[31/90] asus-wmi: fix hwmon/pwm1
    3.0-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Corentin Chary <corentin.chary@gmail.com>

    commit 49979d091d1847823c064301da1ec173619ddd92 upstream.

    The code was completly broken, and should never had been sent
    to the kernel. That's what happens when you write code without
    hardware to test it.

    Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/platform/x86/asus-wmi.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/platform/x86/asus-wmi.c
    +++ b/drivers/platform/x86/asus-wmi.c
    @@ -797,8 +797,8 @@ exit:
    * Hwmon device
    */
    static ssize_t asus_hwmon_pwm1(struct device *dev,
    - struct device_attribute *attr,
    - char *buf)
    + struct device_attribute *attr,
    + char *buf)
    {
    struct asus_wmi *asus = dev_get_drvdata(dev);
    u32 value;
    @@ -809,7 +809,7 @@ static ssize_t asus_hwmon_pwm1(struct de
    if (err < 0)
    return err;

    - value |= 0xFF;
    + value &= 0xFF;

    if (value == 1) /* Low Speed */
    value = 85;
    @@ -869,7 +869,7 @@ static mode_t asus_hwmon_sysfs_is_visibl
    * - reverved bits are non-zero
    * - sfun and presence bit are not set
    */
    - if (value != ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000
    + if (value == ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000
    || (!asus->sfun && !(value & ASUS_WMI_DSTS_PRESENCE_BIT)))
    ok = false;
    }
    @@ -904,6 +904,7 @@ static int asus_wmi_hwmon_init(struct as
    pr_err("Could not register asus hwmon device\n");
    return PTR_ERR(hwmon);
    }
    + dev_set_drvdata(hwmon, asus);
    asus->hwmon_device = hwmon;
    result = sysfs_create_group(&hwmon->kobj, &hwmon_attribute_group);
    if (result)



    \
     
     \ /
      Last update: 2011-08-14 18:29    [W:0.021 / U:0.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site