forked from luck/tmp_suning_uos_patched
regulator: lp872x: Return -EINVAL if pdata is NULL
Return -EINVAL if pdata is NULL, otherwise we have NULL dereference bug. This patch also moves the code checking pdata earlier in lp872x_probe. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
f503071b03
commit
baf73e2c4e
@ -785,11 +785,6 @@ static int lp872x_config(struct lp872x *lp)
|
||||
struct lp872x_platform_data *pdata = lp->pdata;
|
||||
int ret;
|
||||
|
||||
if (!pdata) {
|
||||
dev_warn(lp->dev, "no platform data\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!pdata->update_config)
|
||||
return 0;
|
||||
|
||||
@ -889,6 +884,11 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
||||
[LP8725] = LP8725_NUM_REGULATORS,
|
||||
};
|
||||
|
||||
if (!pdata) {
|
||||
dev_warn(&cl->dev, "no platform data\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
|
||||
if (!lp)
|
||||
goto err_mem;
|
||||
|
Loading…
Reference in New Issue
Block a user