forked from luck/tmp_suning_uos_patched
regulator: move set_machine_constraints after regulator device initialization
Calling set_machine_constraints before regulator device initialization causes crash when constraints have apply_uV set. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
parent
961869048b
commit
74f544c1fc
|
@ -1858,11 +1858,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
|
|||
goto clean;
|
||||
}
|
||||
|
||||
/* set regulator constraints */
|
||||
ret = set_machine_constraints(rdev, &init_data->constraints);
|
||||
if (ret < 0)
|
||||
goto clean;
|
||||
|
||||
/* register with sysfs */
|
||||
rdev->dev.class = ®ulator_class;
|
||||
rdev->dev.parent = dev;
|
||||
|
@ -1874,6 +1869,11 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
|
|||
|
||||
dev_set_drvdata(&rdev->dev, rdev);
|
||||
|
||||
/* set regulator constraints */
|
||||
ret = set_machine_constraints(rdev, &init_data->constraints);
|
||||
if (ret < 0)
|
||||
goto scrub;
|
||||
|
||||
/* add attributes supported by this regulator */
|
||||
ret = add_regulator_attributes(rdev);
|
||||
if (ret < 0)
|
||||
|
|
Loading…
Reference in New Issue
Block a user