aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2024-02-14 10:19:19 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2024-02-14 10:19:19 +0100
commitb9401b65fb203dc7a3611394ce7af812e6033843 (patch)
tree256b61d467286382511299e35b75f356b6f5bff6
parentpmdomain: Merge branch dt into next (diff)
parentpmdomain: arm: Fix NULL dereference on scmi_perf_domain removal (diff)
downloadwireguard-linux-b9401b65fb203dc7a3611394ce7af812e6033843.tar.xz
wireguard-linux-b9401b65fb203dc7a3611394ce7af812e6033843.zip
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.8-rc[n] into the next branch, to allow them to get tested together with the changes that are targeted for v6.9. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/pmdomain/arm/scmi_perf_domain.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pmdomain/arm/scmi_perf_domain.c b/drivers/pmdomain/arm/scmi_perf_domain.c
index 709bbc448fad..d7ef46ccd9b8 100644
--- a/drivers/pmdomain/arm/scmi_perf_domain.c
+++ b/drivers/pmdomain/arm/scmi_perf_domain.c
@@ -159,6 +159,9 @@ static void scmi_perf_domain_remove(struct scmi_device *sdev)
struct genpd_onecell_data *scmi_pd_data = dev_get_drvdata(dev);
int i;
+ if (!scmi_pd_data)
+ return;
+
of_genpd_del_provider(dev->of_node);
for (i = 0; i < scmi_pd_data->num_domains; i++)