aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/coretemp.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-12-01 17:21:28 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 08:52:34 -0800
commit0500898d30ba531cc932c2db171bf2f27ca78abe (patch)
tree4d3a7cdf2f6727c551b70169a5990f1be1eab87c /drivers/hwmon/coretemp.c
parent20f8d725863ca926a199cab1bc5cf31f8bf53cb0 (diff)
downloadkernel_samsung_smdk4412-0500898d30ba531cc932c2db171bf2f27ca78abe.zip
kernel_samsung_smdk4412-0500898d30ba531cc932c2db171bf2f27ca78abe.tar.gz
kernel_samsung_smdk4412-0500898d30ba531cc932c2db171bf2f27ca78abe.tar.bz2
hwmon: (coretemp) Fix oops on driver load
This is for stable kernel branch 3.0 only. Previous and later versions have different code paths and are not affected by this bug. If the CPU microcode is too old, the coretemp driver won't work. But instead of failing gracefully, it currently oops. Check for NULL platform device data to avoid this. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Durgadoss R <durgadoss.r@intel.com> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/coretemp.c')
-rw-r--r--drivers/hwmon/coretemp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index f642194..835ae42 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -539,6 +539,8 @@ static void coretemp_add_core(unsigned int cpu, int pkg_flag)
return;
pdata = platform_get_drvdata(pdev);
+ if (!pdata)
+ return;
err = create_core_data(pdata, pdev, cpu, pkg_flag);
if (err)