diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-09-18 09:49:38 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-18 14:01:10 -0400 |
commit | e13426bf249b4928ad914c9ddf7f8b7e5a93e1c6 (patch) | |
tree | a0e0c2df9c4ec02eeb030751dbc59b0ff9d5725b | |
parent | fe230531b3f94f33e5a4c0b201b651188c6cc132 (diff) |
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>
-rw-r--r-- | drivers/regulator/fan53555.c | 2 |
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, | |||
361 | if (!di) | 361 | if (!di) |
362 | return -ENOMEM; | 362 | return -ENOMEM; |
363 | 363 | ||
364 | di->regulator = pdata->regulator; | ||
364 | if (client->dev.of_node) { | 365 | if (client->dev.of_node) { |
365 | const struct of_device_id *match; | 366 | const struct of_device_id *match; |
366 | 367 | ||
@@ -389,7 +390,6 @@ static int fan53555_regulator_probe(struct i2c_client *client, | |||
389 | return PTR_ERR(di->regmap); | 390 | return PTR_ERR(di->regmap); |
390 | } | 391 | } |
391 | di->dev = &client->dev; | 392 | di->dev = &client->dev; |
392 | di->regulator = pdata->regulator; | ||
393 | i2c_set_clientdata(client, di); | 393 | i2c_set_clientdata(client, di); |
394 | /* Get chip ID */ | 394 | /* Get chip ID */ |
395 | ret = regmap_read(di->regmap, FAN53555_ID1, &val); | 395 | ret = regmap_read(di->regmap, FAN53555_ID1, &val); |