Re: [PATCH] platform/x86: wmi: Skip blocks with zero instances

[Ilpo Järvinen]

On Mon, 27 Nov 2023, Armin Wolf wrote:

> Some machines like the HP Omen 17 ck2000nf contain WMI blocks
> with zero instances, so any WMI driver which tries to handle the
> associated WMI device will fail.
> Skip such WMI blocks to avoid confusing any WMI drivers.
> 
> Reported-by: Alexis Belmonte <alexbelm48@xxxxxxxxx>
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218188
> Tested-by: Alexis Belmonte <alexbelm48@xxxxxxxxx>
> Signed-off-by: Armin Wolf <W_Armin@xxxxxx>

Thanks for the patch. Should this have a Fixes tag?

-- 
 i.


> ---
>  drivers/platform/x86/wmi.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index cb7e74f2b009..4f94e4b117f1 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -1346,6 +1346,11 @@ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *pdev)
>  		if (debug_dump_wdg)
>  			wmi_dump_wdg(&gblock[i]);
> 
> +		if (!gblock[i].instance_count) {
> +			dev_info(wmi_bus_dev, FW_INFO "%pUL has zero instances\n", &gblock[i].guid);
> +			continue;
> +		}
> +
>  		if (guid_already_parsed_for_legacy(device, &gblock[i].guid))
>  			continue;
> 
> --
> 2.39.2
>