[PATCH 2/2] regulator: s5m8767: Prevent possible NULL pointer dereference

2013-02-12 Thread Axel Lin 
s5m8767_pmic_dt_parse_pdata dereferenes pdata, thus check pdata earlier to
avoid NULL pointer dereference.

Signed-off-by: Axel Lin 
---
 drivers/regulator/s5m8767.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

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(>dev, "S5M8767 GPIO DVS NOT VALID\n");
-- 
1.7.9.5



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2] regulator: s5m8767: Prevent possible NULL pointer dereference

2013-02-12 Thread Axel Lin 
s5m8767_pmic_dt_parse_pdata dereferenes pdata, thus check pdata earlier to
avoid NULL pointer dereference.

Signed-off-by: Axel Lin axel@ingics.com
---
 drivers/regulator/s5m8767.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

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);
-- 
1.7.9.5



--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/