[PATCH v2] platform/x86: intel-hid: fix _DSM function index handling

[PATCH v2] platform/x86: intel-hid: fix _DSM function index handling

[Michael Niewöhner]

intel_hid_dsm_fn_mask is a bit mask containing one bit for each function
index. Fix the function index check in intel_hid_evaluate_method
accordingly, which was missed in commit 97ab4516205e ("platform/x86:
intel-hid: fix _DSM function index handling").

Cc: stable@vger.kernel.org
Signed-off-by: Michael Niewöhner <linux@mniewoehner.de>
---
Changes in v2:
Added Cc to stable

 drivers/platform/x86/intel/hid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
index 13f8cf70b9ae..5c39d40a701b 100644
--- a/drivers/platform/x86/intel/hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -238,7 +238,7 @@ static bool intel_hid_evaluate_method(acpi_handle handle,
 
        method_name = (char *)intel_hid_dsm_fn_to_method[fn_index];
 
-       if (!(intel_hid_dsm_fn_mask & fn_index))
+       if (!(intel_hid_dsm_fn_mask & BIT(fn_index)))
                goto skip_dsm_eval;
 
        obj = acpi_evaluate_dsm_typed(handle, &intel_dsm_guid,
-- 
2.34.1

Re: [PATCH v2] platform/x86: intel-hid: fix _DSM function index handling

[Andy Shevchenko]

On Mon, May 16, 2022 at 3:58 PM Michael Niewöhner <linux@mniewoehner.de> wrote:
>
> intel_hid_dsm_fn_mask is a bit mask containing one bit for each function
> index. Fix the function index check in intel_hid_evaluate_method
> accordingly, which was missed in commit 97ab4516205e ("platform/x86:
> intel-hid: fix _DSM function index handling").

Hence Fixes tag?

-- 
With Best Regards,
Andy Shevchenko

[PATCH v3] platform/x86: intel-hid: fix _DSM function index handling

[Michael Niewöhner]

intel_hid_dsm_fn_mask is a bit mask containing one bit for each function
index. Fix the function index check in intel_hid_evaluate_method
accordingly, which was missed in commit 97ab4516205e ("platform/x86:
intel-hid: fix _DSM function index handling").

Fixes: 97ab4516205e ("platform/x86: intel-hid: fix _DSM function index handling")
Cc: stable@vger.kernel.org
Signed-off-by: Michael Niewöhner <linux@mniewoehner.de>
---
Changes in v3:
Added Fixes tag

Changes in v2:
Added Cc to stable

 drivers/platform/x86/intel/hid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
index 13f8cf70b9ae..5c39d40a701b 100644
--- a/drivers/platform/x86/intel/hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -238,7 +238,7 @@ static bool intel_hid_evaluate_method(acpi_handle handle,
 
        method_name = (char *)intel_hid_dsm_fn_to_method[fn_index];
 
-       if (!(intel_hid_dsm_fn_mask & fn_index))
+       if (!(intel_hid_dsm_fn_mask & BIT(fn_index)))
                goto skip_dsm_eval;
 
        obj = acpi_evaluate_dsm_typed(handle, &intel_dsm_guid,

Re: [PATCH v3] platform/x86: intel-hid: fix _DSM function index handling

[Hans de Goede]

Hi,

On 5/17/22 20:31, Michael Niewöhner wrote:
> intel_hid_dsm_fn_mask is a bit mask containing one bit for each function
> index. Fix the function index check in intel_hid_evaluate_method
> accordingly, which was missed in commit 97ab4516205e ("platform/x86:
> intel-hid: fix _DSM function index handling").
> 
> Fixes: 97ab4516205e ("platform/x86: intel-hid: fix _DSM function index handling")
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael Niewöhner <linux@mniewoehner.de>

Thank you for your patch, I've applied this patch to my review-hans 
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans


> ---
> Changes in v3:
> Added Fixes tag
> 
> Changes in v2:
> Added Cc to stable
> 
>  drivers/platform/x86/intel/hid.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
> index 13f8cf70b9ae..5c39d40a701b 100644
> --- a/drivers/platform/x86/intel/hid.c
> +++ b/drivers/platform/x86/intel/hid.c
> @@ -238,7 +238,7 @@ static bool intel_hid_evaluate_method(acpi_handle handle,
>  
>         method_name = (char *)intel_hid_dsm_fn_to_method[fn_index];
>  
> -       if (!(intel_hid_dsm_fn_mask & fn_index))
> +       if (!(intel_hid_dsm_fn_mask & BIT(fn_index)))
>                 goto skip_dsm_eval;
>  
>         obj = acpi_evaluate_dsm_typed(handle, &intel_dsm_guid,
>