From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751879Ab1KFMDH (ORCPT <rfc822;w@1wt.eu>);
	Sun, 6 Nov 2011 07:03:07 -0500
Received: from zone0.gcu-squad.org ([212.85.147.21]:31875 "EHLO
	services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751613Ab1KFMDG (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 6 Nov 2011 07:03:06 -0500
Date: Sun, 6 Nov 2011 13:02:52 +0100
From: Jean Delvare <khali@linux-fr.org>
To: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>, <lm-sensors@lm-sensors.org>,
        <linux-kernel@vger.kernel.org>, <stable@kernel.org>
Subject: Re: [PATCH] hwmon: (w83627ehf) fix broken driver init
Message-ID: <20111106130252.35681de6@endymion.delvare>
In-Reply-To: <1320504223-28764-1-git-send-email-guenter.roeck@ericsson.com>
References: <1320504223-28764-1-git-send-email-guenter.roeck@ericsson.com>
X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-unknown-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, 5 Nov 2011 07:43:43 -0700, Guenter Roeck wrote:
> 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>
> Cc: Jean Delvare <khali@linux-fr.org>
> Cc: stable@kernel.org
> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
> ---
>  drivers/hwmon/w83627ehf.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
> index 483cb26..93f5fc7 100644
> --- a/drivers/hwmon/w83627ehf.c
> +++ b/drivers/hwmon/w83627ehf.c
> @@ -1835,12 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
>  		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;

Applied, thanks.

-- 
Jean Delvare