Messages in this thread | | | From | Heiko Stübner <> | Subject | Re: [PATCH 2/2] regulator: fan53555: Fix null pointer dereference | Date | Thu, 18 Sep 2014 16:22:30 +0200 |
| |
Am Donnerstag, 18. September 2014, 21:49:38 schrieb Axel Lin: > Set di->regulator before dereference it. > > Signed-off-by: Axel Lin <axel.lin@ingics.com>
damn ... thanks for catching this :-)
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> --- > drivers/regulator/fan53555.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c > index 70b31bf..c82fb9e 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);
| |