Re: [PATCH v2] ACPI: bus: Use OF match data for PRP0001 matched devices

[Rafael J. Wysocki]

On Wed, Jan 7, 2026 at 1:03 PM Kartik Rajput <kkartik@xxxxxxxxxx> wrote:
>
> When a device is matched via PRP0001, the driver's OF (DT) match table
> must be used to obtain the device match data. If a driver provides both
> an acpi_match_table and an of_match_table, the current
> acpi_device_get_match_data() path consults the driver's acpi_match_table
> and returns NULL (no ACPI ID matches).
>
> Explicitly detect PRP0001 and fetch match data from the driver's
> of_match_table via acpi_of_device_get_match_data().
>
> Fixes: 886ca88be6b3 ("ACPI / bus: Respect PRP0001 when retrieving device match data")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Kartik Rajput <kkartik@xxxxxxxxxx>
> ---
> Changes in v2:
>         * Fix build errors.
> ---
>  drivers/acpi/bus.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 5e110badac7b..6658c4339656 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -1031,8 +1031,9 @@ const void *acpi_device_get_match_data(const struct device *dev)
>  {
>         const struct acpi_device_id *acpi_ids = dev->driver->acpi_match_table;
>         const struct acpi_device_id *match;
> +       struct acpi_device *adev = ACPI_COMPANION(dev);
>
> -       if (!acpi_ids)

You still need to check acpi_ids against NULL or (better) check adev
against NULL.

> +       if (!strcmp(ACPI_DT_NAMESPACE_HID, acpi_device_hid(adev)))
>                 return acpi_of_device_get_match_data(dev);
>
>         match = acpi_match_device(acpi_ids, dev);
> --