diff mbox series

ALSA: hda: cs35l56: Don't use the device index as a calibration index

Message ID 20240821124711.44325-1-simont@opensource.cirrus.com (mailing list archive)
State New, archived
Headers show
Series ALSA: hda: cs35l56: Don't use the device index as a calibration index | expand

Commit Message

Simon Trimmer Aug. 21, 2024, 12:47 p.m. UTC
The HDA driver cannot assume that the order that the devices are
specified in the cirrus,dev-index matches the order of calibration
entries.

Only a calibration entry with a matching silicon id will be used.

Fixes: cfa43aaa7948 ("ALSA: hda: cs35l56: Apply amp calibration from EFI data")
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
---
 sound/pci/hda/cs35l56_hda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai Aug. 21, 2024, 1:24 p.m. UTC | #1
On Wed, 21 Aug 2024 14:47:11 +0200,
Simon Trimmer wrote:
> 
> The HDA driver cannot assume that the order that the devices are
> specified in the cirrus,dev-index matches the order of calibration
> entries.
> 
> Only a calibration entry with a matching silicon id will be used.
> 
> Fixes: cfa43aaa7948 ("ALSA: hda: cs35l56: Apply amp calibration from EFI data")
> Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>

Thanks, applied now.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index a9dfd62637cf..e3ac0e23ae32 100644
--- a/sound/pci/hda/cs35l56_hda.c
+++ b/sound/pci/hda/cs35l56_hda.c
@@ -1003,7 +1003,7 @@  int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 		goto err;
 	}
 
-	cs35l56->base.cal_index = cs35l56->index;
+	cs35l56->base.cal_index = -1;
 
 	cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);
 	cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;