lkml.org 
[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[209/264] hwmon: (w83627ehf) Fix broken driver init
    3.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Guenter Roeck <guenter.roeck@ericsson.com>

    commit bfa02b0da66965caf46e441270af87edda4fea14 upstream.

    Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI
    sensor types) results in kernel panic if data->temp_label was not
    initialized.
    The problem was found with chip W83627DHG-P.

    Add check if data->temp->label was set before use.

    Based on incomplete patch by Alexander Beregalov.

    Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
    Tested-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/hwmon/w83627ehf.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/hwmon/w83627ehf.c
    +++ b/drivers/hwmon/w83627ehf.c
    @@ -1756,12 +1756,15 @@ static inline void __devinit w83627ehf_i
    diode = 0x70;
    }
    for (i = 0; i < 3; i++) {
    - const char *label = data->temp_label[data->temp_src[i]];
    + const char *label = NULL;
    +
    + if (data->temp_label)
    + label = data->temp_label[data->temp_src[i]];

    /* Digital source overrides analog type */
    - if (strncmp(label, "PECI", 4) == 0)
    + if (label && strncmp(label, "PECI", 4) == 0)
    data->temp_type[i] = 6;
    - else if (strncmp(label, "AMD", 3) == 0)
    + else if (label && strncmp(label, "AMD", 3) == 0)
    data->temp_type[i] = 5;
    else if ((tmp & (0x02 << i)))
    data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;



    \
     
     \ /
      Last update: 2011-11-10 05:05    [W:0.021 / U:29.588 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site