[alsa-devel] [PATCH 26/28] Tighten firmware version requirements.

linux at audioscience.com linux at audioscience.com
Thu Feb 10 05:26:19 CET 2011


From: Eliot Blennerhassett <eblennerhassett at audioscience.com>

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

Signed-off-by: Eliot Blennerhassett <eblennerhassett at audioscience.com>
---
 pci/asihpi/hpidspcd.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pci/asihpi/hpidspcd.c b/pci/asihpi/hpidspcd.c
index f9958e9..fb311d8 100644
--- a/pci/asihpi/hpidspcd.c
+++ b/pci/asihpi/hpidspcd.c
@@ -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);
-- 
1.7.0.4



More information about the Alsa-devel mailing list