diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-01-05 19:03:06 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-01-05 19:03:06 -0800 |
| commit | 80dda9a69a487c72ded1ac69234c8a89d5922b04 (patch) | |
| tree | 24130c9b4980f6a171cbed0d154beaf527a9bfa7 /drivers/interconnect | |
| parent | d3953c78fc78d37f1b795740632ec7c3d83ef98a (diff) | |
| parent | c7ad3dc3649730af483ee1e78be5d0362da25bfe (diff) | |
| download | linux-80dda9a69a487c72ded1ac69234c8a89d5922b04.tar.gz linux-80dda9a69a487c72ded1ac69234c8a89d5922b04.tar.bz2 linux-80dda9a69a487c72ded1ac69234c8a89d5922b04.zip | |
Merge branch 'for-6.8/cxl-misc' into for-6.8/cxl
Pick up some miscellaneous fixups for v6.8.
Diffstat (limited to 'drivers/interconnect')
| -rw-r--r-- | drivers/interconnect/core.c | 3 | ||||
| -rw-r--r-- | drivers/interconnect/qcom/icc-rpm.c | 2 | ||||
| -rw-r--r-- | drivers/interconnect/qcom/sm8250.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index dfab160ca529..50bac2d79d9b 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -395,6 +395,9 @@ struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) } mutex_unlock(&icc_lock); + if (!node) + return ERR_PTR(-EINVAL); + if (IS_ERR(node)) return ERR_CAST(node); diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 628e651c555c..dbacb2a7af50 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -307,7 +307,7 @@ static u64 qcom_icc_calc_rate(struct qcom_icc_provider *qp, struct qcom_icc_node if (qn->ib_coeff) { agg_peak_rate = qn->max_peak[ctx] * 100; - agg_peak_rate = div_u64(qn->max_peak[ctx], qn->ib_coeff); + agg_peak_rate = div_u64(agg_peak_rate, qn->ib_coeff); } else { agg_peak_rate = qn->max_peak[ctx]; } diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c index 83aeb3eedc19..02d40eea0d69 100644 --- a/drivers/interconnect/qcom/sm8250.c +++ b/drivers/interconnect/qcom/sm8250.c @@ -1995,6 +1995,7 @@ static struct platform_driver qnoc_driver = { .driver = { .name = "qnoc-sm8250", .of_match_table = qnoc_of_match, + .sync_state = icc_sync_state, }, }; module_platform_driver(qnoc_driver); |