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

simontrimmer · tiwai · commit 91191a6e50a2 · 2024-08-21T15:23:33.000+02:00
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: cfa43aa ("ALSA: hda: cs35l56: Apply amp calibration from EFI data") Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Link: https://patch.msgid.link/20240821124711.44325-1-simont@opensource.cirrus.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1003,7 +1003,7 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)`
`1003`	`1003`	`goto err;`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`		`- cs35l56->base.cal_index = cs35l56->index;`
	`1006`	`+ cs35l56->base.cal_index = -1;`
`1007`	`1007`
`1008`	`1008`	`cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);`
`1009`	`1009`	`cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;`