diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-05-16 18:39:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-05-16 18:39:08 +0200 |
| commit | fd3d883aa5196ed39786bba7bb703e75276b6b4c (patch) | |
| tree | f8decccc13106efe115b549b37c716aadad75216 | |
| parent | a0982afa0992a9b9ecfe610d6a31fc05bb15a05a (diff) | |
| parent | f6b1eebbdbc75377f98fc9774bb86ffc270dae8e (diff) | |
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()
| -rw-r--r-- | drivers/cpufreq/amd-pstate-ut.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c index 30835d0e4994..65f9d2bae2d3 100644 --- a/drivers/cpufreq/amd-pstate-ut.c +++ b/drivers/cpufreq/amd-pstate-ut.c @@ -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++) { |