Commit 75b15aa0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-intel' 

Merge one more Intel thermal control change for 6.2-rc1:

 - Remove a pointless die_id chec from the Intel HFI thermal control
   driver (Ricardo Neri).

* thermal-intel:
  thermal: intel: hfi: Remove a pointless die_id check
parents 7d4b19ab 3a3073b6

drivers/thermal/intel/intel_hfi.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ void intel_hfi_online(unsigned int cpu) 
	die_id = topology_logical_die_id(cpu);

	hfi_instance = info->hfi_instance;

	if (!hfi_instance) {

		if (die_id < 0 || die_id >= max_hfi_instances)

		if (die_id >= max_hfi_instances)

			return;



		hfi_instance = &hfi_instances[die_id];