Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f41b61b authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai
Browse files

ALSA: asihpi - Tighten firmware version requirements. 



Difference in major.minor between driver and firmware is an error now.
Release version mismatch give a warning.

Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c188dec3

sound/pci/asihpi/hpidspcd.c

+3 −4
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code, 
		goto error2;

	}



	if (header.version / 10000 != HPI_VER_DECIMAL / 10000) {

	if (header.version / 100 != HPI_VER_DECIMAL / 100) {

		dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,

			"Firmware Major Version mismatch "

			"Incompatible firmware version "

			"DSP image %d != Driver %d\n", header.version,

			HPI_VER_DECIMAL);

		goto error2;
@@ -110,9 +110,8 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code, 


	if (header.version != HPI_VER_DECIMAL) {

		dev_printk(KERN_WARNING, &ps_dsp_code->ps_dev->dev,

			"firmware: version mismatch  DSP image %d != Driver %d\n",

			"Firmware: release version mismatch  DSP image %d != Driver %d\n",

			header.version, HPI_VER_DECIMAL);

		/* goto error2;  still allow driver to load */

	}



	HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);