Re: [PATCH 2/2] regulator: fan53555: Fix null pointer dereference

[Heiko Stübner]

Am Donnerstag, 18. September 2014, 21:49:38 schrieb Axel Lin:
> Set di->regulator before dereference it.
> 
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>

damn ... thanks for catching this :-)

Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>


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

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