aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <[email protected]>2024-10-02 12:56:08 +0200
committerUlf Hansson <[email protected]>2024-10-02 12:56:08 +0200
commit69f4d1b1cba756738bbc639218a89ea7f2c44f83 (patch)
treef53255bcccf2b149f137e4e6cb8b8a36141a7cd1
parentba84ca67acd5b9eb428a88065c288e10eab84413 (diff)
parent500580c7ae7bbd38c7641102059fa9308f35d26c (diff)
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.12-rc[n] into the next branch, to allow them to get tested together with the new changes that are targeted for v6.13. Signed-off-by: Ulf Hansson <[email protected]>
-rw-r--r--drivers/pmdomain/qcom/cpr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pmdomain/qcom/cpr.c b/drivers/pmdomain/qcom/cpr.c
index e1fca65b80be..26a60a101e42 100644
--- a/drivers/pmdomain/qcom/cpr.c
+++ b/drivers/pmdomain/qcom/cpr.c
@@ -1052,7 +1052,7 @@ static unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref,
of_parse_phandle(child_np, "required-opps", 0);
if (child_req_np == ref_np) {
- u64 rate;
+ u64 rate = 0;
of_property_read_u64(child_np, "opp-hz", &rate);
return (unsigned long) rate;