]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/x86: hp-wmi: Fix implementation of the platform_profile_omen_get function
authorAlexis Belmonte <alexbelm48@gmail.com>
Fri, 12 Jul 2024 17:26:47 +0000 (19:26 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 15 Jul 2024 09:38:42 +0000 (12:38 +0300)
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>
drivers/platform/x86/hp/hp-wmi.c

index c8bcb3e2b3444a74405523d4d601eff3ac859d68..876e0a97cee1c060dfad8caab88cba69aab052a0 100644 (file)
@@ -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)