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

Merge tag 'amd-pstate-v6.16-2025-05-15' of... 

Merge tag 'amd-pstate-v6.16-2025-05-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Merge an amd-pstate driver fix for 6.16 (5/15/25) from Mario
Liminciello:

"Fix an error caught with -Werror in amd-pstate-ut."

* tag 'amd-pstate-v6.16-2025-05-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Avoid shadowing ret in amd_pstate_ut_check_driver()
parents a0982afa f6b1eebb

drivers/cpufreq/amd-pstate-ut.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int amd_pstate_ut_check_driver(u32 index) 
	int ret;



	for (mode1 = AMD_PSTATE_DISABLE; mode1 < AMD_PSTATE_MAX; mode1++) {

		int ret = amd_pstate_set_mode(mode1);

		ret = amd_pstate_set_mode(mode1);

		if (ret)

			return ret;

		for (mode2 = AMD_PSTATE_DISABLE; mode2 < AMD_PSTATE_MAX; mode2++) {