Unverified Commit 69efe3b8 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: handle errors with acpi_dev_get_first_match_dev() 



acpi_dev_get_first_match_dev() searches for an acpi_handle
instantiated by the ACPI table scanning done early during boot.

Two of three machine drivers using this search don't deal with errors
and the one which does (bytcr_rt5651) returns -ENODEV, which doesn't
make sense here: an alternate driver will not be probed.

Add consistent error handling and report -ENXIO.

Suggested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210813151116.23931-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c50f126b

sound/soc/intel/boards/bytcht_es8316.c

+3 −0
Original line number Diff line number Diff line
@@ -492,6 +492,9 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
			 "i2c-%s", acpi_dev_name(adev));

		put_device(&adev->dev);

		byt_cht_es8316_dais[dai_index].codecs->name = codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENXIO;

	}



	/* override plaform name, if required */

sound/soc/intel/boards/bytcr_rt5640.c

+3 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
			 "i2c-%s", acpi_dev_name(adev));

		put_device(&adev->dev);

		byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENXIO;

	}



	/*

sound/soc/intel/boards/bytcr_rt5651.c

+1 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENODEV;

		return -ENXIO;

	}



	codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL,