platform/x86: hp-wmi: Fix implementation of the platform_profile_omen_get function
BugLink: https://bugs.launchpad.net/bugs/2106632 Fix ill-formed implementation of the platform_profile_omen_get function introduced by the commit d23430233494 ("platform/x86: hp-wmi: Fix platform profile option switch bug on Omen and Victus laptops"). platform_profile_omen_get() is .profile_get function that should set *profile and return 0 on success. Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Fixes: d23430233494 ("platform/x86: hp-wmi: Fix platform profile option switch bug on Omen and Victus laptops") Signed-off-by: Alexis Belmonte <alexbelm48@gmail.com> Reviewed-by: Armin Wolf <W_Armin@gmx.de> Link: https://lore.kernel.org/r/ZpFnV8w1558BW7iZ@alexis-pc Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> (cherry picked from commit f6bd2f633b686cdd6a466a4d8484fb74492b1125) [diewald: dependency commit for 032fe9b05167 platform/x86: hp-wmi: mark 8A15 board for timed OMEN thermal profile] Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
7b61f5e818
commit
fa24401ba3
@@ -1238,8 +1238,6 @@ static int platform_profile_omen_get_ec(enum platform_profile_option *profile)
|
||||
static int platform_profile_omen_get(struct platform_profile_handler *pprof,
|
||||
enum platform_profile_option *profile)
|
||||
{
|
||||
enum platform_profile_option selected_platform_profile;
|
||||
|
||||
/*
|
||||
* We directly return the stored platform profile, as the embedded
|
||||
* controller will not accept switching to the performance option when
|
||||
@@ -1253,9 +1251,9 @@ static int platform_profile_omen_get(struct platform_profile_handler *pprof,
|
||||
* See also omen_powersource_event.
|
||||
*/
|
||||
guard(mutex)(&active_platform_profile_lock);
|
||||
selected_platform_profile = active_platform_profile;
|
||||
*profile = active_platform_profile;
|
||||
|
||||
return selected_platform_profile;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool has_omen_thermal_profile_ec_timer(void)
|
||||
|
||||
Reference in New Issue
Block a user