2022-05-16 18:15:35

by Michael Niewöhner

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

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").

Signed-off-by: Michael Niewöhner <[email protected]>
---
 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

2022-05-17 01:30:01

by Greg Kroah-Hartman

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

On Mon, May 16, 2022 at 12:23:22PM +0200, 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").
>
> Signed-off-by: Michael Niew?hner <[email protected]>
> ---
> ?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
>
>

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>