summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShailendra Verma <shailendra.v@samsung.com>2017-01-30 10:34:58 +0530
committerEduardo Valentin <edubezval@gmail.com>2017-02-18 17:27:36 -0800
commit8b051ec37c93b28e1f1cac4c9677ff88e56930ff (patch)
tree5aba94f1f64819c0b330bc800223bcd699d14b22 /drivers
parentef9b36d9101eb2d5827699a4e969c719fb8812c0 (diff)
downloadlinux-stable-8b051ec37c93b28e1f1cac4c9677ff88e56930ff.tar.gz
linux-stable-8b051ec37c93b28e1f1cac4c9677ff88e56930ff.tar.bz2
linux-stable-8b051ec37c93b28e1f1cac4c9677ff88e56930ff.zip
thermal: imx: Fix possible NULL dereference.
of_device_get_match_data could return NULL, and so can cause a NULL pointer dereference later. Signed-off-by: Shailendra Verma <shailendra.v@samsung.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thermal/imx_thermal.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 06912f0602b7..fb648a45754e 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -489,6 +489,10 @@ static int imx_thermal_probe(struct platform_device *pdev)
data->tempmon = map;
data->socdata = of_device_get_match_data(&pdev->dev);
+ if (!data->socdata) {
+ dev_err(&pdev->dev, "no device match found\n");
+ return -ENODEV;
+ }
/* make sure the IRQ flag is clear before enabling irq on i.MX6SX */
if (data->socdata->version == TEMPMON_IMX6SX) {