All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] ALSA: hda: i915: Alays handle -EPROBE_DEFER
@ 2023-11-15 12:36 ` Maarten Lankhorst
  0 siblings, 0 replies; 18+ messages in thread
From: Maarten Lankhorst @ 2023-11-15 12:36 UTC (permalink / raw)
  To: alsa-devel; +Cc: Takashi Iwai, intel-gfx, intel-xe

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>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tested-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Fixes: e6d0c13e9f46 ("ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init")
Cc: Takashi Iwai <tiwai@suse.de>

---
Using Takashi's version, as I like the separate -EPROBE_DEFER if more.
---
 sound/pci/hda/hda_intel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 058f6e6491f9..8e9a003daa8d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2140,6 +2140,9 @@ static int azx_probe(struct pci_dev *pci,
 	if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
 		err = snd_hdac_i915_init(azx_bus(chip));
 		if (err < 0) {
+			if (err == -EPROBE_DEFER)
+				goto out_free;
+
 			/* if the controller is bound only with HDMI/DP
 			 * (for HSW and BDW), we need to abort the probe;
 			 * for other chips, still continue probing as other
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-11-17 13:09 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 12:36 [Intel-gfx] [PATCH] ALSA: hda: i915: Alays handle -EPROBE_DEFER Maarten Lankhorst
2023-11-15 13:21 ` maarten.lankhorst
2023-11-15 12:36 ` [Intel-xe] " Maarten Lankhorst
2023-11-15 12:43 ` Takashi Iwai
2023-11-15 12:43   ` [Intel-xe] " Takashi Iwai
2023-11-15 12:43   ` [Intel-gfx] " Takashi Iwai
2023-11-15 16:10 ` [Intel-xe] ✓ CI.Patch_applied: success for " Patchwork
2023-11-15 16:11 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-11-15 16:12 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-11-15 16:19 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-11-15 16:19 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-11-15 16:21 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-11-15 20:33 ` [PATCH] " Ville Syrjälä
2023-11-15 20:33   ` [Intel-xe] " Ville Syrjälä
2023-11-15 20:33   ` [Intel-gfx] " Ville Syrjälä
2023-11-15 23:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2023-11-16  0:01 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-11-17 13:09 ` [Intel-xe] ✗ CI.Patch_applied: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.