From: Axel Lin Date: Wed, 13 Feb 2013 01:31:31 +0000 (+0800) Subject: regulator: s5m8767: Prevent possible NULL pointer dereference X-Git-Tag: v3.9-rc1~154^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e81d7bc89c9623ea000890fb4cdf7e731dc21f71;p=platform%2Fkernel%2Flinux-exynos.git regulator: s5m8767: Prevent possible NULL pointer dereference s5m8767_pmic_dt_parse_pdata dereferenes pdata, thus check pdata earlier to avoid NULL pointer dereference. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index ef0532d..8a83194 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -659,17 +659,17 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) struct s5m8767_info *s5m8767; int i, ret, size, buck_init; + if (!pdata) { + dev_err(pdev->dev.parent, "Platform data not supplied\n"); + return -ENODEV; + } + if (iodev->dev->of_node) { ret = s5m8767_pmic_dt_parse_pdata(pdev, pdata); if (ret) return ret; } - if (!pdata) { - dev_err(pdev->dev.parent, "Platform data not supplied\n"); - return -ENODEV; - } - if (pdata->buck2_gpiodvs) { if (pdata->buck3_gpiodvs || pdata->buck4_gpiodvs) { dev_err(&pdev->dev, "S5M8767 GPIO DVS NOT VALID\n");