ALSA: hda/tas2781: properly initialize speaker_id for TAS2563
Subsystems (2)
PATCH 1/1 ALSA: hda/tas2781: properly initialize speaker_id for TAS2563
After speaker id retrieval was refactored to happen in tas2781_read_acpi, devices that do not use a speaker id need a negative speaker_id value instead of NULL, but no initialization was added to the TAS2563 code path. This causes the driver to attempt to load a non-existent firmware file name with a speaker id of 0 ("TAS2XXX38700.bin") instead of the correct file name without a speaker id ("TAS2XXX3870.bin"), resulting in low volume and these dmesg errors:
tas2781-hda i2c-INT8866:00: Direct firmware load for TAS2XXX38700.bin failed with error -2
tas2781-hda i2c-INT8866:00: tasdevice_dsp_parser: load TAS2XXX38700.bin error
tas2781-hda i2c-INT8866:00: dspfw load TAS2XXX38700.bin error
[...]
tas2781-hda i2c-INT8866:00: tasdevice_prmg_load: Firmware is NULLFix this by setting speaker_id to -1 as is done for other models.
--- sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/hda/codecs/side-codecs/tas2781_hda_i2c.c +3 -1
@@ -111,8 +111,10 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid) sub =acpi_get_subsystem_id (ACPI_HANDLE (physdev));if (IS_ERR (sub)) {/* No subsys id in older tas2563 projects. */ -if (!strncmp (hid,"INT8866" ,sizeof ("INT8866" ))) +if (!strncmp (hid,"INT8866" ,sizeof ("INT8866" ))) { + p->speaker_id =-1 ; goto end_2563; + }dev_err (p->dev,"Failed to get SUBSYS ID.\n" ); ret =PTR_ERR (sub); goto err;
Signature · 1 line
2.52.0
Quoted 15 lines · August Wikerfors
After speaker id retrieval was refactored to happen in
tas2781_read_acpi, devices that do not use a speaker id need a negativespeaker_idvalue instead of NULL, but no initialization was added to the TAS2563 code path. This causes the driver to attempt to load a non-existent firmware file name with a speaker id of 0 ("TAS2XXX38700.bin") instead of the correct file name without a speaker id ("TAS2XXX3870.bin"), resulting in low volume and these dmesg errors:tas2781-hda i2c-INT8866:00: Direct firmware load for TAS2XXX38700.bin failed with error -2 tas2781-hda i2c-INT8866:00: tasdevice_dsp_parser: load TAS2XXX38700.bin error tas2781-hda i2c-INT8866:00: dspfw load TAS2XXX38700.bin error [...] tas2781-hda i2c-INT8866:00: tasdevice_prmg_load: Firmware is NULL
Quoted 5 lines
Fix this by setting
speaker_idto -1 as is done for other models.Fixes 945865a0ddf3 ("ALSA: hda/tas2781: fix speaker id retrieval for multiple probes")Signed-off-by August Wikerfors <[email protected]>
Applied now. Thanks.
Takashi