diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-08-04 22:48:58 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-08-04 22:48:58 +0200 |
commit | 978423952985c915c8389d066eacb9e257c7bd1e (patch) | |
tree | 3ecf5b726bfefc5d9797aa6899d0a93630c831d2 /drivers/powercap/intel_rapl_common.c | |
parent | 16e95a62eed18864aecac404f1e4eed764c363f2 (diff) | |
parent | 2fa00769b1e4bcf20cf0c967cb45f0cd1cea2b5c (diff) |
Merge back earlier power capping changes for v6.6.
Diffstat (limited to 'drivers/powercap/intel_rapl_common.c')
-rw-r--r-- | drivers/powercap/intel_rapl_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 8fac57b28f8a..f173fba828ef 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1485,7 +1485,7 @@ static int rapl_detect_domains(struct rapl_package *rp) } pr_debug("found %d domains on %s\n", rp->nr_domains, rp->name); - rp->domains = kcalloc(rp->nr_domains + 1, sizeof(struct rapl_domain), + rp->domains = kcalloc(rp->nr_domains, sizeof(struct rapl_domain), GFP_KERNEL); if (!rp->domains) return -ENOMEM; |