[alsa-devel] [PATCH] ASoC: acpi: fix: continue searching when machine is ignored

[Pierre-Louis Bossart]

On 10/31/18 9:36 PM, Keyon Jie wrote:
> The machine_quirk may return NULL which means the acpi entries should be
> skipped and search for next matched entry is needed, here add return
> check here and continue for NULL case.

Nice catch, this was missed in the other patchset since the ACPI ID to 
ignore was the last in the table...

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>

>
> Signed-off-by: Keyon Jie <yang.jie at linux.intel.com>
> ---
>   sound/soc/soc-acpi.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c
> index b8e72b52db30..faf8941363e4 100644
> --- a/sound/soc/soc-acpi.c
> +++ b/sound/soc/soc-acpi.c
> @@ -15,7 +15,10 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
>   		if (acpi_dev_present(mach->id, NULL, -1)) {
>   			if (mach->machine_quirk)
>   				mach = mach->machine_quirk(mach);
> -			return mach;
> +
> +			/* return matched machine, continue otherwise */
> +			if (mach)
> +				return mach;
>   		}
>   	}
>   	return NULL;