Commit 10674d97 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'powercap' 

* powercap:
  powercap: intel_rapl: add NULL pointer check to rapl_mmio_cpu_online()
parents c936069f 3aa3c588

drivers/powercap/intel_rapl_common.c

+3 −0
Original line number Diff line number Diff line
@@ -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);