aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <guenter.roeck@ericsson.com>2011-03-10 15:47:14 -0800
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-03-14 22:39:20 -0700
commit02309ad2b8cbcf45260dd9bb5a527799a612c161 (patch)
treeed6c4051a881bbee05e0fce5f7ffeb8dfee74f8f /drivers/hwmon
parentd42e869acf0da4502c452b786dee35f0ecf4cbc8 (diff)
downloadkernel_samsung_smdk4412-02309ad2b8cbcf45260dd9bb5a527799a612c161.zip
kernel_samsung_smdk4412-02309ad2b8cbcf45260dd9bb5a527799a612c161.tar.gz
kernel_samsung_smdk4412-02309ad2b8cbcf45260dd9bb5a527799a612c161.tar.bz2
hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F
Systems with NCT6775F reported temperature sensor labels for systems with NCT6776F. This patch fixes the problem. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/w83627ehf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index d180319..f2b377c 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1899,9 +1899,10 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
else
data->in6_skip = 1;
}
+ data->temp_label = nct6776_temp_label;
+ } else {
+ data->temp_label = nct6775_temp_label;
}
-
- data->temp_label = nct6776_temp_label;
} else if (sio_data->kind == w83667hg_b) {
u8 reg;