Unverified Commit e39cacc1 authored Mar 04, 2018 by Hans de Goede Committed by Mark Brown Mar 07, 2018

ASoC: Intel: bytcr_rt5651: Not being able to find the codec ACPI-dev is an error



If we cannot find the codec ACPI-dev, then the snd-soc-core will not be
able to find the codec either and snd_soc_register_card() will just keep
exiting with -EPROBE_DEFER, filling the log with errors each time the
probe gets retried.

Instead simply log an error from the machine driver and exit with -ENODEV.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 12af5004

sound/soc/intel/boards/bytcr_rt5651.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -540,12 +540,13 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)

		/* fixup codec name based on HID */
		i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);
		if (i2c_name) {
		if (!i2c_name) {
		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
		return -ENODEV;
		}
		snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name),
		"%s%s", "i2c-", i2c_name);

		byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name;
		}

		/* check quirks before creating card */
		dmi_check_system(byt_rt5651_quirk_table);

Admin message