Skip to content

Commit 4c62eee

Browse files
committed
Merge: Intel_rapl: Add support for Panther Lake platform
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6646 JIRA: https://issues.redhat.com/browse/RHEL-47408 Signed-off-by: David Arcari <[email protected]> Approved-by: Steve Best <[email protected]> Approved-by: Tony Camuso <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 6c053e4 + 161276e commit 4c62eee

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/powercap/intel_rapl_common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
12651265
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
12661266
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &rapl_defaults_spr_server),
12671267
X86_MATCH_VFM(INTEL_LUNARLAKE_M, &rapl_defaults_core),
1268+
X86_MATCH_VFM(INTEL_PANTHERLAKE_L, &rapl_defaults_core),
12681269
X86_MATCH_VFM(INTEL_ARROWLAKE_H, &rapl_defaults_core),
12691270
X86_MATCH_VFM(INTEL_ARROWLAKE, &rapl_defaults_core),
12701271
X86_MATCH_VFM(INTEL_ARROWLAKE_U, &rapl_defaults_core),

drivers/powercap/powercap_sys.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,7 @@ struct powercap_control_type *powercap_register_control_type(
627627
dev_set_name(&control_type->dev, "%s", name);
628628
result = device_register(&control_type->dev);
629629
if (result) {
630-
if (control_type->allocated)
631-
kfree(control_type);
630+
put_device(&control_type->dev);
632631
return ERR_PTR(result);
633632
}
634633
idr_init(&control_type->idr);

0 commit comments

Comments
 (0)