Skip to content

Commit 9e88b49

Browse files
mlankhorsttiwai
authored andcommitted
ALSA: hda: i915: Alays handle -EPROBE_DEFER
It turns out that even if the comment says that the driver can load fine, it's not really the case and no codecs are detected. Specifically for -EPROBE_DEFER, always fail the probe. This fixes a regression when HDA-intel is loaded before i915. Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Closes: https://lore.kernel.org/r/ZVNUxZzCGcxQzqJX@intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Tested-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Fixes: e6d0c13 ("ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init") Link: https://gitlab.freedesktop.org/drm/intel/-/issues/9671 Link: https://lore.kernel.org/r/20231115123625.74286-1-maarten.lankhorst@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent b944aa9 commit 9e88b49

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

sound/pci/hda/hda_intel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,6 +2141,9 @@ static int azx_probe(struct pci_dev *pci,
21412141
if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
21422142
err = snd_hdac_i915_init(azx_bus(chip));
21432143
if (err < 0) {
2144+
if (err == -EPROBE_DEFER)
2145+
goto out_free;
2146+
21442147
/* if the controller is bound only with HDMI/DP
21452148
* (for HSW and BDW), we need to abort the probe;
21462149
* for other chips, still continue probing as other

0 commit comments

Comments
 (0)