summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-09-18 17:49:38 +0400
committerMark Brown <broonie@kernel.org>2014-09-18 22:01:10 +0400
commite13426bf249b4928ad914c9ddf7f8b7e5a93e1c6 (patch)
treea0e0c2df9c4ec02eeb030751dbc59b0ff9d5725b /drivers/regulator
parentfe230531b3f94f33e5a4c0b201b651188c6cc132 (diff)
downloadlinux-e13426bf249b4928ad914c9ddf7f8b7e5a93e1c6.tar.xz
regulator: fan53555: Fix null pointer dereference
Set di->regulator before dereference it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/fan53555.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 0168106b2cf7..f8e4257aef92 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -361,6 +361,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,
if (!di)
return -ENOMEM;
+ di->regulator = pdata->regulator;
if (client->dev.of_node) {
const struct of_device_id *match;
@@ -389,7 +390,6 @@ static int fan53555_regulator_probe(struct i2c_client *client,
return PTR_ERR(di->regmap);
}
di->dev = &client->dev;
- di->regulator = pdata->regulator;
i2c_set_clientdata(client, di);
/* Get chip ID */
ret = regmap_read(di->regmap, FAN53555_ID1, &val);