Skip to content

Commit 42f9508

Browse files
committed
Merge tag 'pm-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "These fix an uninitialized variable usage in the operating performance points code and add missing DT bindings for it. Specifics: - Fix uninitialized variable usage in dev_pm_opp_config_clks_simple() (Christophe JAILLET) - Add missing OPP DT properties (Rob Herring)" * tag 'pm-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes OPP: Fix an un-initialized variable usage
2 parents 1a61b82 + 9614369 commit 42f9508

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040
patternProperties:
4141
'^opp-?[0-9]+$':
4242
type: object
43+
additionalProperties: false
4344

4445
properties:
4546
opp-hz: true

Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
patternProperties:
2020
'^opp-?[0-9]+$':
2121
type: object
22+
additionalProperties: false
2223

2324
properties:
2425
opp-level: true

drivers/opp/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ int dev_pm_opp_config_clks_simple(struct device *dev,
873873
}
874874
}
875875

876-
return ret;
876+
return 0;
877877
}
878878
EXPORT_SYMBOL_GPL(dev_pm_opp_config_clks_simple);
879879

0 commit comments

Comments
 (0)