diff options
author | Eliot Blennerhassett <eblennerhassett@audioscience.com> | 2011-02-09 23:26:19 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-02-10 12:49:39 -0500 |
commit | 7f41b61b3b38b28ac3fd3af7088196204ce170e3 (patch) | |
tree | c9f4dc0fd0d2a49ba3b278fa19038460d11517b6 /sound/pci/asihpi | |
parent | c188dec310c598d6c38d3db31f201c5629e6dc08 (diff) |
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: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi')
-rw-r--r-- | sound/pci/asihpi/hpidspcd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c index f9958e9885ff..fb311d8c05bf 100644 --- a/sound/pci/asihpi/hpidspcd.c +++ b/sound/pci/asihpi/hpidspcd.c | |||
@@ -100,9 +100,9 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code, | |||
100 | goto error2; | 100 | goto error2; |
101 | } | 101 | } |
102 | 102 | ||
103 | if (header.version / 10000 != HPI_VER_DECIMAL / 10000) { | 103 | if (header.version / 100 != HPI_VER_DECIMAL / 100) { |
104 | dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev, | 104 | dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev, |
105 | "Firmware Major Version mismatch " | 105 | "Incompatible firmware version " |
106 | "DSP image %d != Driver %d\n", header.version, | 106 | "DSP image %d != Driver %d\n", header.version, |
107 | HPI_VER_DECIMAL); | 107 | HPI_VER_DECIMAL); |
108 | goto error2; | 108 | goto error2; |
@@ -110,9 +110,8 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code, | |||
110 | 110 | ||
111 | if (header.version != HPI_VER_DECIMAL) { | 111 | if (header.version != HPI_VER_DECIMAL) { |
112 | dev_printk(KERN_WARNING, &ps_dsp_code->ps_dev->dev, | 112 | dev_printk(KERN_WARNING, &ps_dsp_code->ps_dev->dev, |
113 | "firmware: version mismatch DSP image %d != Driver %d\n", | 113 | "Firmware: release version mismatch DSP image %d != Driver %d\n", |
114 | header.version, HPI_VER_DECIMAL); | 114 | header.version, HPI_VER_DECIMAL); |
115 | /* goto error2; still allow driver to load */ | ||
116 | } | 115 | } |
117 | 116 | ||
118 | HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name); | 117 | HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name); |