| Message ID | 20240226124432.1203798-3-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cf9c19df2755d57501ce3922bb22ff0734d8bed5 |
| Headers | show |
| Series | ALSA/ASoC: Conditionally skip i915 init and cleanups | expand |
On Mon, Feb 26, 2024 at 01:44:29PM +0100, Cezary Rojewski wrote: > If i915 does not support given platform but the hardware i.e.: HDAudio > codec is still there, the codec-probing procedure will succeed for such > device but the follow up initialization will always end up with -ENODEV. Acked-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index d2117e36ddd1..7c6bedeceaa2 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev) struct hda_codec *codec = dev_to_hda_codec(&hdev->dev); struct snd_soc_component_driver *comp_drv; + if (hda_codec_is_display(codec) && !hdev->bus->audio_component) { + dev_dbg(&hdev->dev, "no i915, skip registration for 0x%08x\n", hdev->vendor_id); + return -ENODEV; + } + comp_drv = devm_kzalloc(&hdev->dev, sizeof(*comp_drv), GFP_KERNEL); if (!comp_drv) return -ENOMEM;
If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with -ENODEV. While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+)