lkml.org 
[lkml]   [2010]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/11] hwmon: applesmc: Handle new temperature format (rev2)
    Date
    The recent Macbooks have temperature registers of a new type.
    This patch adds the logic to handle them.

    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    ---
    drivers/hwmon/applesmc.c | 12 +++++++++---
    1 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
    index 55abb5f..6663721 100644
    --- a/drivers/hwmon/applesmc.c
    +++ b/drivers/hwmon/applesmc.c
    @@ -728,13 +728,19 @@ static ssize_t applesmc_show_temperature(struct device *dev,
    entry = applesmc_get_entry_by_index(index);
    if (IS_ERR(entry))
    return PTR_ERR(entry);
    + if (entry->len > 2)
    + return -EINVAL;

    - ret = applesmc_read_entry(entry, buffer, 2);
    + ret = applesmc_read_entry(entry, buffer, entry->len);
    if (ret)
    return ret;

    - temp = buffer[0]*1000;
    - temp += (buffer[1] >> 6) * 250;
    + if (entry->len == 2) {
    + temp = buffer[0] * 1000;
    + temp += (buffer[1] >> 6) * 250;
    + } else {
    + temp = buffer[0] * 4000;
    + }

    return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", temp);
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-11-09 16:21    [W:3.816 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site