diff options
| author | Eliot Blennerhassett <eblennerhassett@audioscience.com> | 2011-02-10 17:26:19 +1300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-10 18:49:39 +0100 |
| commit | 7f41b61b3b38b28ac3fd3af7088196204ce170e3 (patch) | |
| tree | c9f4dc0fd0d2a49ba3b278fa19038460d11517b6 /sound/pci/asihpi | |
| parent | c188dec310c598d6c38d3db31f201c5629e6dc08 (diff) | |
| download | op-kernel-dev-7f41b61b3b38b28ac3fd3af7088196204ce170e3.zip op-kernel-dev-7f41b61b3b38b28ac3fd3af7088196204ce170e3.tar.gz | |
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 f9958e9..fb311d8 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, 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); |
