Unverified Commit 77c60722 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ALSA: hda: cs35l56: Fix order of searching for firmware files 



Check for the cases of system-specific bin file without a
wmfw before falling back to looking for a generic wmfw.

All system-specific options should be tried before falling
back to loading a generic wmfw/bin. With the original code,
the presence of a fallback generic wmfw on the filesystem
would prevent using a system-specific tuning with a ROM
firmware.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 73cfbfa9 ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier")
Link: https://msgid.link/r/20240129162737.497-16-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9e92b77c

sound/pci/hda/cs35l56_hda.c

+14 −10
Original line number Diff line number Diff line
@@ -483,6 +483,20 @@ static void cs35l56_hda_request_firmware_files(struct cs35l56_hda *cs35l56, 
								  NULL, "bin");

			return;

		}



		/*

		 * Check for system-specific bin files without wmfw before

		 * falling back to generic firmware

		 */

		if (amp_name)

			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,

							  cirrus_dir, system_name, amp_name, "bin");

		if (!*coeff_firmware)

			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,

							  cirrus_dir, system_name, NULL, "bin");



		if (*coeff_firmware)

			return;

	}



	ret = cs35l56_hda_request_firmware_file(cs35l56, wmfw_firmware, wmfw_filename,
@@ -493,16 +507,6 @@ static void cs35l56_hda_request_firmware_files(struct cs35l56_hda *cs35l56, 
		return;

	}



	/* When a firmware file is not found must still search for the coeff files */

	if (system_name) {

		if (amp_name)

			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,

							  cirrus_dir, system_name, amp_name, "bin");

		if (!*coeff_firmware)

			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,

							  cirrus_dir, system_name, NULL, "bin");

	}



	if (!*coeff_firmware)

		cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,

						  cirrus_dir, NULL, NULL, "bin");