Commit 40f2f1aa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ec' and 'acpi-processor' 

* acpi-ec:
  ACPI: EC: Relax sanity check of the ECDT ID string

* acpi-processor:
  ACPI: processor: perflib: Move problematic pr->performance check
parents 963e22c0 d405ec23

drivers/acpi/processor_perflib.c

+4 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy) 
		struct acpi_processor *pr = per_cpu(processors, cpu);

		int ret;



		if (!pr || !pr->performance)

		if (!pr)

			continue;



		/*
@@ -197,6 +197,9 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy) 
			pr_err("Failed to add freq constraint for CPU%d (%d)\n",

			       cpu, ret);



		if (!pr->performance)

			continue;



		ret = acpi_processor_get_platform_limit(pr);

		if (ret)

			pr_err("Failed to update freq constraint for CPU%d (%d)\n",