VisionFive2 Linux kernel

author: Harry Pan <harry.pan@intel.com> 2019-12-30 22:36:56 +0800 committer: Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2020-01-07 12:24:34 +0100 commit: 3aa3c5882e4fb2274448908aaed605a3ed7dd15d parent: c79f46a282390e0f5b306007bf7b11a46d529538

Commit Summary:

powercap: intel_rapl: add NULL pointer check to rapl_mmio_cpu_online()

Diffstat:

1 file changed, 3 insertions, 0 deletions

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index a67701ed93e8..2e5b6a6834da 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1295,6 +1295,9 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
 	struct cpuinfo_x86 *c = &cpu_data(cpu);
 	int ret;
 
+	if (!rapl_defaults)
+		return ERR_PTR(-ENODEV);
+
 	rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL);
 	if (!rp)
 		return ERR_PTR(-ENOMEM);